summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2019-06-06 19:58:38 +0200
committerJules Laplace <julescarbon@gmail.com>2019-06-06 19:58:38 +0200
commitb48db4cbb9d88da3c841a02c080f0a0bbcb73435 (patch)
tree6df1a22840b1f188ce50ad35281709a80a1d23dd
parent8b4827e78a66c5f58cb52900483000896464f97f (diff)
updated faces
-rw-r--r--client/splash/constants.js8
-rw-r--r--client/splash/face/all_faces.json21
-rw-r--r--client/splash/face/all_faces_offsets.js24
-rw-r--r--client/splash/face/editor.css11
-rw-r--r--client/splash/face/editor.js120
-rw-r--r--client/splash/face/faces.js14
-rw-r--r--client/splash/face/faces.json4
-rw-r--r--client/splash/face/index.js13
-rw-r--r--client/splash/face/mesh.js32
-rw-r--r--megapixels/commands/misc/obj2ply.py13
-rw-r--r--package-lock.json51
-rw-r--r--package.json1
-rw-r--r--site/assets/data/faces/brad_smith_1_0.drcbin160603 -> 160797 bytes
-rw-r--r--site/assets/data/faces/bush_1_0.drcbin165255 -> 165136 bytes
-rw-r--r--site/assets/data/faces/george_tenet_1_0.drcbin156334 -> 156649 bytes
-rw-r--r--site/assets/data/faces/john_ashcroft_1_0.drcbin167825 -> 167873 bytes
-rw-r--r--site/assets/data/faces/macron_1_0.drcbin141367 -> 141270 bytes
-rw-r--r--site/assets/data/faces/macron_2_0.drcbin150209 -> 150228 bytes
-rw-r--r--site/assets/data/faces/macron_4_0.drcbin148036 -> 148023 bytes
-rw-r--r--site/assets/data/faces/putin_0.drcbin150530 -> 151538 bytes
-rw-r--r--site/assets/data/faces/putin_1_0.drcbin184203 -> 185050 bytes
-rw-r--r--site/assets/data/faces/putin_2_0.drcbin168179 -> 168603 bytes
-rw-r--r--site/assets/data/faces/putin_3_0.drcbin143099 -> 143645 bytes
-rw-r--r--site/assets/data/faces/putin_4_0.drcbin168568 -> 168610 bytes
-rw-r--r--site/assets/data/faces/trudeau_1_0.drcbin170508 -> 170842 bytes
-rw-r--r--site/assets/data/faces/trudeau_2_0.drcbin160676 -> 161148 bytes
-rw-r--r--site/assets/data/faces/trudeau_3_0.drcbin166457 -> 166804 bytes
-rw-r--r--site/assets/data/faces/trudeau_4_0.drcbin161956 -> 161974 bytes
-rw-r--r--site/assets/data/faces/trudeau_5_0.drcbin144156 -> 144419 bytes
-rw-r--r--site/assets/data/faces/trump_1_0.drcbin148636 -> 148781 bytes
-rw-r--r--site/assets/data/faces/trump_2_0.drcbin173206 -> 173831 bytes
-rw-r--r--site/assets/data/faces/trump_3_0.drcbin170969 -> 171113 bytes
-rw-r--r--site/assets/data/faces/trump_3_1.drcbin124027 -> 123352 bytes
-rw-r--r--site/assets/data/faces/trump_4_0.drcbin147021 -> 147802 bytes
-rw-r--r--site/assets/data/faces/xi_1_0.drcbin150777 -> 151458 bytes
-rw-r--r--site/assets/data/faces/xi_2_0.drcbin155786 -> 155696 bytes
36 files changed, 268 insertions, 44 deletions
diff --git a/client/splash/constants.js b/client/splash/constants.js
index e137ad7d..19d70475 100644
--- a/client/splash/constants.js
+++ b/client/splash/constants.js
@@ -31,10 +31,10 @@ export const FACE_SCALE = 1
/* face markers */
-export const FACE_MARKERS_SCALE = 0.83
-export const FACE_OFFSET_X = 0
-export const FACE_OFFSET_Y = -0.058
-export const FACE_OFFSET_Z = 0.0525
+export const FACE_MARKERS_SCALE = 0.83 // 0.83
+export const FACE_OFFSET_X = 0 // 0
+export const FACE_OFFSET_Y = 0 // -0.058
+export const FACE_OFFSET_Z = 0 // 0.0525
export const MARKER_POINT_COLOR = 0xffffff
export const MARKER_COLORS = [
diff --git a/client/splash/face/all_faces.json b/client/splash/face/all_faces.json
new file mode 100644
index 00000000..c13cd0ae
--- /dev/null
+++ b/client/splash/face/all_faces.json
@@ -0,0 +1,21 @@
+{
+ "george_tenet_1_0": [[242.645, 787.534, -734.218], [255.135, 892.593, -720.523], [276.936, 987.487, -706.674], [294.356, 1076.281, -683.377], [313.559, 1174.745, -631.587], [343.65, 1251.219, -534.77], [376.667, 1297.489, -417.792], [429.089, 1339.094, -301.545], [533.767, 1354.164, -226.891], [658.403, 1319.431, -228.3], [761.56, 1267.703, -294.162], [849.448, 1212.351, -370.97], [918.559, 1129.221, -434.628], [950.389, 1026.746, -469.032], [965.596, 934.328, -482.946], [976.51, 836.529, -487.52], [979.435, 729.564, -496.042], [217.415, 675.035, -388.843], [237.488, 638.928, -314.204], [275.586, 624.953, -254.246], [318.274, 625.883, -211.426], [361.112, 635.608, -184.179], [549.183, 620.62, -123.798], [598.253, 602.846, -121.638], [656.973, 593.413, -131.766], [724.645, 599.017, -156.752], [788.244, 629.175, -204.111], [459.076, 729.963, -138.228], [448.603, 794.026, -90.822], [438.287, 856.188, -42.357], [438.981, 909.948, -31.283], [414.852, 959.308, -175.027], [435.797, 963.37, -142.597], [470.379, 967.786, -119.015], [511.503, 956.999, -118.329], [546.938, 948.188, -132.893], [280.333, 746.207, -331.641], [297.352, 722.319, -278.669], [342.192, 718.545, -262.565], [390.279, 739.43, -262.515], [348.705, 753.707, -263.534], [305.182, 759.3, -290.854], [583.597, 724.412, -201.751], [619.573, 696.128, -175.002], [666.18, 693.448, -160.344], [714.422, 712.406, -191.08], [671.878, 729.744, -172.207], [620.051, 732.439, -176.69], [361.65, 1086.691, -298.003], [391.399, 1053.257, -209.632], [445.446, 1029.984, -145.57], [479.633, 1033.536, -130.641], [515.06, 1024.526, -122.782], [598.603, 1037.234, -143.52], [675.519, 1064.782, -199.747], [601.394, 1113.405, -160.857], [545.002, 1138.201, -144.598], [492.854, 1146.575, -153.148], [445.553, 1146.001, -175.739], [407.591, 1127.87, -222.243], [373.158, 1084.99, -294.104], [443.353, 1062.597, -177.663], [486.746, 1058.894, -150.932], [538.251, 1055.624, -146.779], [667.532, 1064.519, -201.634], [539.355, 1099.24, -153.884], [491.029, 1106.276, -161.038], [448.584, 1104.729, -185.209]],
+ "brad_smith_1_0": [[483.882, 285.483, -210.348], [489.55, 323.759, -211.204], [499.109, 358.485, -212.771], [507.472, 390.643, -211.141], [519.087, 427.222, -201.408], [538.683, 457.493, -176.317], [561.914, 478.585, -143.686], [593.343, 499.505, -113.253], [638.623, 508.043, -99.981], [682.431, 492.976, -113.584], [711.917, 468.934, -143.979], [733.31, 444.824, -176.022], [749.667, 412.644, -200.488], [757.226, 374.764, -209.784], [761.884, 341.314, -211.503], [766.979, 305.834, -210.259], [768.369, 267.105, -209.311], [513.5, 254.818, -84.117], [528.994, 243.393, -59.181], [549.003, 239.709, -42.368], [568.656, 240.839, -32.634], [586.48, 244.779, -28.786], [660.204, 240.253, -28.711], [677.664, 233.332, -32.402], [697.042, 229.295, -41.955], [717.928, 230.374, -58.303], [734.732, 240.027, -83.02], [625.962, 282.389, -27.119], [627.348, 308.247, -12.07], [628.745, 332.631, 2.741], [629.88, 352.39, 3.602], [603.972, 363.907, -47.218], [615.325, 366.575, -38.923], [630.554, 368.647, -35.132], [645.597, 364.396, -39.036], [656.728, 360.046, -47.363], [541.011, 282.133, -74.401], [552.987, 274.254, -56.796], [570.648, 273.341, -56.043], [587.518, 281.423, -62.426], [572.516, 286.906, -58.649], [554.079, 288.15, -63.466], [662.674, 276.615, -62.596], [678.609, 266.094, -56.178], [696.775, 265.082, -56.44], [710.354, 271.395, -73.587], [697.51, 278.702, -62.721], [678.518, 279.955, -58.344], [564.537, 401.027, -99.754], [587.001, 393.527, -67.531], [617.087, 388.094, -48.124], [631.88, 389.556, -47.017], [646.465, 386.262, -47.969], [676.76, 387.851, -67.673], [699.23, 394.122, -100.944], [674.869, 420.628, -80.759], [654.801, 432.892, -68.055], [633.406, 436.906, -64.985], [612.248, 435.68, -67.857], [591.689, 425.387, -80.564], [568.611, 401.062, -100.547], [611.076, 397.414, -60.433], [631.709, 396.789, -55.526], [652.578, 395.002, -60.088], [696.503, 394.498, -101.185], [652.26, 419.064, -68.446], [632.125, 422.509, -65.046], [612.164, 420.468, -69.6]],
+ "john_ashcroft_1_0": [[331.695, 552.606, -455.728], [340.902, 633.069, -449.814], [357.367, 706.095, -445.935], [373.256, 773.529, -433.554], [394.047, 847.46, -399.268], [429.891, 907.495, -334.291], [470.89, 945.31, -253.215], [525.525, 976.506, -176.735], [611.911, 991.374, -141.992], [702.001, 969.03, -162.065], [767.068, 934.697, -228.187], [819.688, 893.915, -300.756], [862.426, 831.377, -358.939], [884.514, 755.887, -389.32], [897.834, 686.926, -400.16], [908.902, 612.739, -402.488], [913.818, 531.224, -406.583], [371.309, 474.795, -196.333], [399.721, 449.079, -144.773], [438.562, 441.048, -107.362], [477.245, 444.318, -83.725], [513.372, 453.907, -71.614], [664.091, 447.636, -59.199], [701.194, 434.83, -65.447], [743.213, 428.325, -82.469], [789.073, 433.167, -112.322], [827.312, 457.548, -158.02], [591.88, 532.607, -58.052], [590.599, 583.333, -24.561], [589.31, 633.136, 10.676], [590.038, 675.188, 17.231], [549.322, 711.419, -75.699], [568.609, 715.25, -56.426], [595.89, 719.9, -46.056], [624.193, 713.115, -51.811], [646.044, 707.601, -67.772], [424.956, 533.963, -166.635], [447.327, 518.209, -130.62], [483.799, 516.9, -126.547], [519.015, 533.72, -134.541], [487.807, 543.905, -128.891], [450.441, 546.265, -141.467], [673.191, 528.217, -122.798], [705.589, 508.438, -109.413], [742.999, 507.505, -106.697], [772.897, 521.797, -137.574], [743.528, 535.142, -117.081], [704.228, 536.056, -111.461], [499.973, 809.31, -129.501], [532.851, 788.006, -79.381], [574.411, 771.721, -50.269], [597.684, 775.353, -45.956], [620.928, 770.193, -46.286], [667.451, 783.201, -68.441], [706.485, 801.832, -112.851], [666.173, 822.813, -76.87], [633.287, 836.904, -61.968], [599.684, 840.445, -60.577], [567.071, 839.146, -66.9], [537.272, 827.467, -86.996], [509.839, 807.039, -125.596], [569.844, 798.67, -72.715], [599.105, 797.138, -62.89], [629.89, 796.91, -67.908], [699.479, 800.324, -111.049], [628.189, 804.041, -66.252], [598.424, 806.722, -64.964], [569.698, 805.822, -71.525]],
+ "macron_1_0": [[188.972, 179.885, -140.564], [193.309, 203.481, -138.294], [199.517, 224.707, -136.467], [205.349, 244.334, -131.971], [213.217, 265.547, -120.829], [225.827, 281.712, -100.463], [239.85, 290.716, -75.659], [257.778, 297.565, -51.95], [284.564, 299.249, -41.233], [311.445, 291.309, -48.625], [330.376, 280.78, -69.975], [345.411, 268.778, -92.755], [356.715, 250.182, -111.443], [361.244, 227.638, -121.695], [363.188, 207.012, -126.073], [364.403, 184.906, -127.698], [363.665, 160.737, -129.649], [201.228, 154.351, -63.314], [209.5, 146.104, -48.071], [221.132, 142.585, -37.119], [232.92, 142.54, -30.147], [243.983, 144.484, -26.567], [288.43, 139.51, -23.904], [299.225, 135.039, -26.184], [311.562, 132.373, -31.67], [325.19, 133.103, -40.906], [336.889, 139.332, -54.851], [268.757, 164.433, -22.327], [269.566, 178.66, -11.621], [270.448, 192.598, -0.398], [271.638, 204.683, 2.047], [259.241, 216.518, -26.802], [265.51, 217.224, -20.937], [274.196, 217.975, -17.753], [282.882, 215.255, -19.841], [289.618, 213.083, -24.946], [218.933, 169.757, -54.307], [225.416, 164.414, -43.736], [236.094, 163.156, -42.76], [246.839, 167.294, -45.399], [237.813, 170.791, -43.298], [226.791, 172.43, -46.804], [292.674, 162.342, -42.912], [301.86, 155.859, -39.114], [312.853, 154.876, -38.517], [321.914, 158.589, -47.868], [313.652, 162.787, -41.413], [302.076, 163.825, -39.511], [243.602, 245.381, -45.656], [254.454, 238.378, -30.062], [268.375, 232.909, -20.488], [276.132, 233.492, -19.232], [283.618, 231.274, -19.457], [299.428, 233.539, -27.311], [312.582, 238.012, -41.664], [299.29, 245.448, -29.025], [288.718, 250.088, -23.033], [277.919, 251.897, -22.171], [267.307, 252.461, -24.269], [257.058, 250.103, -31.531], [246.45, 244.521, -44.995], [266.89, 240.536, -27.051], [276.907, 239.495, -24.042], [287.318, 238.461, -25.772], [310.57, 237.752, -41.37], [286.696, 241.17, -25.038], [276.816, 242.701, -24.137], [267.178, 243.187, -26.459]],
+ "macron_2_0": [[302.544, 191.97, -188.177], [308.177, 225.159, -190.296], [316.397, 255.029, -192.552], [324.242, 283.411, -190.736], [335.019, 315.549, -180.311], [352.536, 342.858, -156.494], [372.009, 361.11, -125.182], [396.443, 376.145, -94.797], [433.165, 381.038, -81.063], [470.013, 369.066, -89.386], [495.665, 350.08, -116.14], [516.315, 328.548, -144.369], [531.967, 298.573, -165.595], [538.345, 264.998, -174.68], [541.04, 235.391, -176.197], [542.661, 204.439, -173.604], [541.62, 170.589, -170.997], [319.844, 174.791, -79.13], [331.258, 167.399, -56.796], [347.268, 165.34, -41.328], [363.488, 167.075, -32.01], [378.697, 170.684, -27.638], [439.641, 165.019, -23.33], [454.496, 158.587, -25.627], [471.436, 153.853, -32.585], [490.019, 152.823, -45.362], [505.815, 157.999, -65.752], [412.509, 198.882, -26.556], [413.604, 220.888, -15.325], [414.809, 242.825, -3.291], [416.373, 260.165, -2.591], [399.203, 269.986, -43.864], [407.772, 272.388, -36.099], [419.681, 274.309, -32.042], [431.589, 270.206, -34.327], [440.761, 266.17, -40.869], [344.042, 198.212, -70.651], [353.079, 193.419, -55.341], [367.747, 191.997, -53.819], [382.482, 197.27, -58.348], [370.083, 202.411, -56.198], [354.865, 203.752, -61.206], [445.067, 191.679, -54.35], [457.748, 183.74, -47.935], [472.855, 182.716, -47.033], [485.205, 185.758, -60.53], [473.893, 192.93, -52.664], [457.972, 194.614, -50.199], [377.71, 305.668, -74.863], [392.773, 299.876, -52.684], [411.729, 294.788, -38.931], [422.26, 296.013, -37.475], [432.435, 292.997, -37.313], [453.788, 294.544, -48.343], [471.704, 297.335, -68.499], [453.558, 309.579, -52.933], [439.14, 316.911, -45.885], [424.418, 319.348, -45.042], [409.965, 319.594, -47.898], [396.0, 314.87, -56.976], [381.635, 304.629, -73.788], [409.664, 303.773, -49.521], [423.28, 303.172, -45.373], [437.408, 301.506, -47.556], [468.951, 296.98, -68.01], [436.442, 304.149, -46.767], [422.987, 306.264, -45.834], [409.86, 306.371, -48.918]],
+ "macron_4_0": [[526.078, 299.778, -145.104], [532.335, 327.61, -150.655], [541.132, 352.448, -156.659], [549.404, 376.006, -159.787], [561.458, 403.564, -157.767], [580.984, 427.679, -144.606], [603.546, 445.413, -125.224], [631.616, 462.063, -107.976], [667.223, 466.225, -103.603], [697.238, 450.28, -116.355], [713.986, 426.624, -139.29], [724.817, 403.209, -162.444], [732.259, 374.925, -178.544], [734.49, 345.0, -182.076], [735.561, 319.529, -180.159], [737.117, 292.992, -175.745], [735.762, 264.325, -170.744], [560.789, 290.982, -52.136], [574.513, 284.918, -33.99], [591.106, 282.86, -23.183], [606.931, 283.495, -18.133], [620.893, 285.55, -17.508], [675.148, 276.543, -24.292], [687.273, 269.608, -28.029], [700.328, 263.862, -36.546], [713.961, 260.883, -50.802], [723.987, 263.115, -71.834], [652.453, 309.648, -24.358], [656.762, 330.363, -16.447], [661.006, 350.183, -8.466], [663.149, 364.874, -10.161], [638.708, 369.128, -46.264], [648.274, 371.329, -41.557], [660.169, 372.227, -40.52], [670.634, 367.391, -44.397], [677.651, 362.221, -51.184], [583.959, 310.034, -50.948], [594.46, 305.583, -38.368], [607.567, 303.571, -39.435], [619.859, 307.416, -46.735], [609.496, 313.055, -43.048], [595.286, 314.833, -44.9], [675.039, 298.083, -53.799], [686.985, 289.904, -49.5], [700.353, 287.767, -51.431], [708.832, 289.108, -66.097], [701.015, 296.871, -57.645], [687.48, 299.82, -52.641], [605.551, 393.106, -84.826], [625.695, 390.174, -62.934], [649.915, 386.451, -51.216], [661.052, 386.56, -52.077], [671.517, 382.863, -53.788], [691.734, 379.077, -71.304], [705.101, 377.323, -98.357], [690.814, 400.628, -83.671], [678.101, 412.511, -73.628], [662.872, 417.406, -69.682], [646.819, 417.892, -69.615], [629.455, 410.673, -75.839], [608.493, 392.666, -85.825], [644.556, 392.163, -60.763], [660.384, 390.755, -59.199], [675.195, 387.222, -64.375], [703.072, 377.744, -98.298], [675.373, 402.466, -72.304], [661.047, 406.935, -68.173], [645.605, 406.535, -69.293]],
+ "putin_0": [[213.856, 465.647, -411.257], [222.308, 534.779, -405.78], [236.739, 597.453, -402.19], [251.086, 654.67, -391.072], [270.737, 716.579, -360.595], [304.611, 766.633, -304.431], [343.967, 797.499, -234.748], [395.432, 821.818, -169.819], [471.629, 833.809, -142.962], [548.606, 814.875, -165.0], [602.64, 787.286, -226.261], [645.153, 753.662, -292.666], [679.588, 701.188, -346.471], [697.657, 637.787, -375.464], [709.029, 579.284, -386.655], [718.752, 515.643, -390.029], [723.278, 445.521, -394.413], [260.728, 398.197, -188.863], [288.158, 375.686, -145.991], [323.904, 368.383, -115.678], [358.677, 371.1, -97.046], [390.649, 379.45, -88.209], [522.125, 373.683, -84.311], [554.124, 362.333, -91.299], [589.869, 356.501, -107.801], [628.468, 360.778, -135.387], [659.754, 382.018, -176.015], [459.334, 447.072, -79.316], [459.718, 490.219, -50.119], [460.152, 532.316, -19.096], [461.003, 568.037, -13.053], [421.444, 598.893, -89.547], [439.058, 602.165, -74.008], [462.958, 606.072, -66.282], [486.923, 600.161, -72.546], [505.055, 595.366, -87.039], [309.01, 448.751, -164.657], [330.135, 435.255, -134.693], [361.931, 434.04, -132.849], [392.074, 448.156, -141.11], [365.283, 456.988, -134.734], [332.348, 459.076, -143.867], [527.152, 443.052, -137.813], [555.995, 426.187, -127.901], [588.544, 425.214, -127.253], [613.039, 437.327, -154.986], [588.349, 448.725, -135.875], [554.587, 449.692, -129.318], [377.624, 682.066, -128.143], [407.943, 663.927, -88.674], [444.423, 649.823, -66.796], [464.376, 652.872, -64.105], [484.012, 648.444, -65.525], [522.183, 659.505, -85.318], [552.963, 675.054, -122.938], [520.495, 690.355, -90.035], [493.393, 701.583, -76.2], [465.285, 704.424, -73.655], [437.584, 703.635, -77.477], [411.347, 694.694, -92.935], [386.471, 679.791, -124.856], [439.765, 673.269, -85.049], [464.775, 671.948, -78.329], [490.263, 671.683, -83.681], [546.884, 673.558, -120.862], [488.802, 673.075, -80.086], [464.069, 675.167, -77.859], [439.774, 674.917, -81.746]],
+ "putin_3_0": [[226.515, 169.07, -145.897], [230.23, 193.773, -149.938], [236.35, 216.038, -154.181], [242.183, 237.096, -155.531], [249.218, 261.859, -150.753], [260.187, 285.315, -135.728], [272.227, 303.826, -114.063], [288.528, 320.02, -93.542], [315.024, 327.404, -84.009], [342.71, 318.159, -87.154], [362.73, 301.337, -103.353], [378.881, 282.077, -121.58], [391.914, 257.904, -133.903], [398.615, 232.672, -137.047], [402.664, 211.157, -134.677], [405.989, 188.597, -129.534], [407.227, 163.713, -124.622], [235.488, 167.602, -60.303], [243.677, 163.95, -42.289], [255.452, 164.595, -29.887], [267.377, 167.318, -22.602], [278.656, 170.938, -19.334], [326.292, 169.218, -13.697], [337.849, 164.662, -14.342], [351.069, 161.063, -18.735], [365.713, 159.666, -27.915], [378.21, 163.184, -43.55], [304.222, 196.825, -20.842], [304.096, 215.575, -14.693], [303.847, 234.143, -8.104], [304.359, 247.571, -9.582], [292.92, 251.04, -40.302], [298.6, 253.665, -34.675], [306.867, 255.741, -31.786], [315.412, 253.241, -32.696], [321.97, 250.216, -36.866], [252.409, 188.144, -55.427], [259.018, 186.31, -42.944], [270.552, 186.15, -41.264], [281.876, 190.589, -44.621], [272.093, 194.38, -44.031], [260.385, 194.129, -48.421], [330.106, 189.096, -39.289], [340.126, 183.888, -33.498], [351.983, 183.538, -32.311], [361.73, 185.118, -42.744], [352.409, 191.274, -37.685], [339.925, 192.278, -36.26], [280.176, 277.191, -63.018], [289.227, 275.031, -46.106], [300.84, 272.059, -36.256], [307.611, 273.341, -35.072], [314.385, 271.776, -34.645], [328.017, 274.022, -41.531], [339.915, 275.631, -55.923], [328.517, 285.087, -47.79], [318.972, 290.847, -45.45], [308.965, 292.215, -45.725], [299.27, 291.342, -47.549], [290.602, 286.096, -52.131], [283.221, 276.936, -61.344], [300.082, 278.508, -45.253], [308.335, 278.604, -42.003], [317.154, 278.162, -43.305], [337.626, 275.451, -55.133], [316.942, 280.355, -43.692], [308.274, 281.372, -43.965], [299.926, 280.642, -45.845]],
+ "putin_4_0": [[451.195, 211.212, -229.643], [452.813, 250.2, -229.218], [458.195, 285.904, -229.351], [463.302, 318.714, -225.143], [470.781, 354.919, -210.508], [486.076, 385.829, -180.774], [504.976, 406.682, -142.792], [531.132, 424.568, -106.267], [572.762, 435.183, -89.618], [617.446, 427.551, -99.76], [650.734, 412.621, -131.713], [677.724, 393.895, -165.974], [700.337, 364.706, -192.697], [713.438, 329.329, -205.657], [722.108, 296.861, -209.338], [730.011, 261.702, -208.539], [735.138, 222.772, -208.152], [473.964, 182.996, -103.697], [488.839, 173.365, -78.499], [508.113, 171.845, -60.715], [526.848, 175.435, -49.746], [544.054, 181.652, -44.458], [617.247, 184.383, -39.113], [635.694, 179.29, -41.796], [656.271, 177.137, -49.848], [678.294, 180.301, -64.318], [695.975, 191.758, -86.943], [579.314, 221.793, -40.449], [577.015, 246.688, -25.872], [574.768, 271.003, -10.427], [573.694, 291.027, -8.534], [552.151, 303.404, -54.199], [561.638, 306.687, -45.281], [574.924, 310.24, -40.561], [589.073, 307.737, -43.242], [600.086, 305.213, -50.658], [498.211, 213.522, -91.393], [509.65, 207.834, -73.881], [527.245, 208.574, -72.067], [543.682, 217.545, -76.566], [528.234, 221.409, -73.916], [510.106, 220.858, -79.79], [618.845, 220.691, -71.46], [635.251, 212.815, -64.6], [653.318, 213.749, -63.468], [667.284, 220.686, -78.684], [652.664, 226.502, -69.114], [633.627, 225.769, -66.309], [522.825, 343.674, -84.3], [540.573, 337.596, -59.893], [562.528, 333.112, -45.247], [574.051, 335.878, -43.415], [585.829, 334.176, -43.443], [609.125, 340.506, -54.86], [628.291, 348.054, -76.63], [606.552, 357.065, -58.615], [589.385, 362.565, -50.911], [572.605, 363.029, -50.07], [556.453, 361.247, -53.231], [541.625, 354.504, -63.321], [527.65, 342.977, -82.609], [558.887, 344.448, -56.461], [573.93, 345.337, -51.861], [589.59, 345.976, -54.233], [625.01, 347.124, -75.809], [588.259, 347.043, -52.402], [573.157, 347.244, -51.533], [558.665, 345.724, -54.837]],
+ "bush_1_0": [[727.397, 1094.826, -788.155], [748.522, 1229.826, -775.047], [781.484, 1351.789, -765.46], [812.248, 1465.849, -743.351], [856.189, 1592.385, -688.038], [930.62, 1689.119, -582.054], [1016.272, 1746.919, -453.333], [1125.929, 1800.589, -333.324], [1284.28, 1819.104, -282.856], [1437.249, 1773.157, -333.468], [1538.344, 1705.264, -452.627], [1616.012, 1634.553, -579.167], [1675.562, 1528.557, -683.021], [1700.395, 1396.468, -736.821], [1712.913, 1277.462, -760.041], [1724.311, 1151.749, -771.061], [1723.983, 1014.443, -784.031], [828.357, 940.388, -359.076], [881.319, 892.039, -276.135], [950.867, 872.468, -217.887], [1019.708, 872.371, -182.176], [1082.733, 884.022, -165.434], [1337.011, 863.591, -164.812], [1397.987, 840.727, -181.359], [1466.153, 829.03, -216.559], [1539.664, 837.056, -273.169], [1599.708, 876.907, -355.417], [1221.194, 1004.218, -145.315], [1226.859, 1085.802, -82.149], [1233.174, 1164.874, -18.414], [1238.674, 1233.906, -4.792], [1153.206, 1300.17, -173.502], [1191.848, 1304.817, -141.892], [1244.122, 1309.898, -126.441], [1295.571, 1295.794, -141.848], [1333.933, 1284.427, -173.636], [927.723, 1030.095, -313.057], [968.761, 997.383, -255.218], [1029.961, 992.17, -252.89], [1089.229, 1019.656, -271.426], [1037.691, 1037.956, -256.278], [973.77, 1045.836, -272.734], [1349.834, 998.871, -272.306], [1404.079, 961.175, -253.747], [1466.973, 957.439, -253.974], [1514.725, 983.187, -310.136], [1469.963, 1004.92, -270.315], [1404.409, 1008.411, -255.619], [1035.566, 1466.32, -313.028], [1107.651, 1420.491, -212.895], [1202.281, 1389.151, -152.92], [1251.521, 1393.301, -147.841], [1299.535, 1381.269, -152.16], [1397.878, 1397.445, -212.884], [1473.373, 1435.437, -315.654], [1395.268, 1504.559, -237.704], [1330.454, 1538.341, -193.596], [1260.761, 1550.153, -183.114], [1191.57, 1549.497, -192.804], [1124.665, 1525.02, -237.134], [1050.886, 1464.79, -313.768], [1186.364, 1430.847, -191.447], [1252.543, 1425.338, -175.026], [1320.057, 1420.661, -190.498], [1463.127, 1435.703, -315.451], [1319.81, 1489.167, -202.779], [1255.188, 1499.135, -191.896], [1191.162, 1496.89, -206.125]],
+ "trump_1_0": [[504.7, 187.729, -147.397], [508.86, 212.512, -144.249], [515.222, 234.76, -142.356], [521.751, 256.662, -138.581], [530.814, 282.418, -128.962], [546.016, 303.033, -110.269], [562.995, 317.044, -87.393], [583.567, 331.6, -67.978], [613.687, 337.183, -60.983], [641.833, 326.491, -69.481], [658.427, 309.661, -89.474], [671.407, 293.14, -112.514], [682.057, 270.784, -131.64], [686.621, 243.928, -141.199], [689.107, 220.894, -145.036], [691.288, 197.774, -147.479], [691.266, 172.535, -150.701], [526.294, 160.513, -66.157], [536.671, 151.572, -50.509], [550.129, 148.337, -39.299], [563.343, 148.298, -32.559], [575.382, 150.261, -29.373], [623.888, 146.12, -30.181], [635.259, 142.116, -33.919], [647.841, 139.963, -41.18], [661.189, 141.048, -52.641], [671.725, 148.488, -68.677], [602.067, 173.61, -25.683], [603.654, 189.455, -13.192], [605.352, 205.296, -0.668], [606.509, 218.686, 2.296], [590.02, 231.809, -28.713], [597.027, 232.248, -22.58], [606.644, 233.02, -19.799], [615.934, 230.673, -22.919], [622.435, 229.019, -29.39], [545.106, 178.044, -57.356], [553.363, 172.06, -46.416], [565.226, 171.057, -46.205], [576.397, 176.21, -49.792], [566.696, 179.837, -46.784], [554.295, 181.341, -49.755], [625.244, 172.168, -51.051], [635.662, 165.073, -47.963], [647.782, 164.361, -48.264], [656.318, 169.071, -59.347], [648.127, 173.48, -51.403], [635.743, 174.101, -48.203], [572.05, 269.468, -51.671], [583.669, 257.039, -31.932], [599.17, 249.038, -21.362], [607.911, 249.619, -20.358], [616.466, 247.568, -21.593], [632.472, 253.029, -33.01], [644.156, 264.815, -53.918], [633.643, 282.125, -42.379], [623.341, 290.844, -35.63], [610.573, 293.596, -33.643], [597.823, 292.605, -34.52], [586.469, 285.24, -40.911], [575.058, 269.589, -51.655], [596.951, 258.251, -29.08], [607.947, 256.53, -25.817], [619.258, 256.347, -29.372], [642.141, 265.099, -53.674], [620.605, 280.8, -36.231], [609.362, 283.053, -34.453], [598.155, 281.711, -36.546]],
+ "trump_2_0": [[404.237, 737.678, -557.72], [411.951, 846.214, -564.894], [430.033, 945.157, -574.447], [447.928, 1036.939, -572.102], [479.685, 1140.546, -545.809], [543.239, 1228.836, -480.009], [622.489, 1289.936, -393.77], [722.575, 1346.705, -314.871], [853.911, 1373.654, -295.336], [973.176, 1341.777, -354.527], [1046.546, 1284.806, -460.702], [1098.776, 1222.583, -566.264], [1140.994, 1134.268, -646.943], [1164.487, 1030.167, -680.994], [1181.201, 936.992, -689.915], [1199.83, 837.867, -687.198], [1209.705, 728.816, -682.429], [548.151, 673.129, -215.618], [604.659, 648.567, -152.145], [669.102, 643.385, -114.155], [728.55, 651.481, -95.846], [779.975, 666.432, -93.106], [985.247, 664.614, -125.601], [1034.18, 647.25, -143.82], [1085.693, 637.204, -179.181], [1137.482, 641.116, -234.361], [1172.803, 665.271, -311.808], [883.559, 769.602, -108.577], [889.072, 840.708, -68.91], [895.298, 909.17, -28.148], [895.614, 964.163, -25.95], [800.854, 988.422, -153.98], [835.641, 998.75, -135.674], [879.068, 1007.705, -131.535], [919.656, 997.219, -149.061], [948.046, 985.785, -177.424], [626.265, 752.941, -202.346], [668.666, 736.399, -158.813], [718.093, 735.899, -164.682], [761.198, 758.551, -190.398], [720.272, 771.696, -173.088], [666.573, 772.251, -178.131], [972.333, 756.484, -224.561], [1021.32, 731.967, -213.328], [1071.749, 732.249, -221.948], [1101.542, 748.282, -275.527], [1068.615, 767.411, -239.998], [1017.439, 768.598, -219.721], [670.658, 1082.705, -266.409], [746.515, 1069.907, -195.553], [835.09, 1061.656, -158.731], [875.045, 1068.375, -162.362], [914.182, 1060.963, -170.758], [986.985, 1067.611, -233.769], [1035.057, 1081.469, -326.513], [973.156, 1135.286, -255.607], [922.576, 1160.658, -212.595], [867.156, 1166.809, -195.628], [810.326, 1162.328, -194.784], [750.869, 1137.334, -220.339], [682.756, 1081.695, -269.014], [813.207, 1086.398, -189.993], [870.082, 1088.678, -186.646], [923.923, 1086.01, -206.919], [1027.044, 1080.856, -325.031], [917.656, 1121.378, -214.773], [865.77, 1126.574, -197.557], [811.842, 1120.699, -200.234]],
+ "trump_3_0": [[828.043, 693.018, -576.894], [849.042, 790.005, -564.064], [878.207, 877.191, -554.341], [905.863, 956.532, -535.012], [938.885, 1041.859, -488.153], [986.85, 1107.626, -404.34], [1037.973, 1145.609, -301.608], [1106.22, 1173.895, -205.583], [1212.078, 1182.173, -160.793], [1319.558, 1145.114, -184.729], [1397.223, 1099.36, -265.769], [1458.192, 1047.252, -356.328], [1504.571, 969.552, -430.582], [1524.42, 877.276, -471.704], [1534.306, 792.622, -488.352], [1540.656, 700.841, -495.273], [1538.656, 600.734, -505.161], [859.379, 577.971, -261.412], [890.012, 539.438, -199.526], [935.887, 523.054, -153.563], [983.087, 521.755, -123.821], [1028.241, 529.453, -108.005], [1212.821, 504.652, -89.972], [1256.895, 484.56, -97.223], [1308.099, 472.575, -117.377], [1365.994, 475.288, -152.456], [1417.365, 504.881, -205.491], [1133.878, 619.754, -84.043], [1137.276, 680.884, -40.141], [1140.316, 740.444, 6.046], [1145.778, 791.653, 16.464], [1103.284, 845.406, -93.315], [1126.443, 846.9, -69.507], [1159.409, 849.065, -56.331], [1192.669, 838.143, -63.193], [1218.618, 830.008, -82.311], [930.771, 644.288, -219.459], [955.484, 620.369, -175.731], [1000.322, 614.779, -170.081], [1045.818, 632.197, -177.901], [1008.439, 648.04, -171.119], [963.012, 655.493, -187.168], [1234.955, 608.018, -160.439], [1272.341, 579.225, -144.696], [1318.324, 573.61, -140.681], [1357.67, 589.812, -176.939], [1322.26, 608.557, -151.581], [1273.823, 613.798, -145.469], [1059.555, 974.983, -146.947], [1093.917, 941.899, -88.3], [1139.684, 915.135, -55.056], [1167.384, 916.728, -49.225], [1194.217, 908.312, -49.767], [1250.56, 921.601, -73.554], [1299.191, 943.831, -124.115], [1254.347, 971.026, -81.415], [1217.251, 991.258, -64.639], [1178.018, 999.099, -63.623], [1139.5, 1000.944, -71.339], [1103.667, 990.306, -95.108], [1071.397, 970.815, -141.287], [1138.773, 950.908, -80.366], [1172.093, 945.223, -68.514], [1207.802, 942.475, -74.024], [1290.149, 942.555, -121.646], [1206.862, 950.434, -71.176], [1172.606, 956.597, -70.404], [1139.255, 958.815, -78.062]],
+ "trump_4_0": [[237.644, 212.119, -130.064], [239.657, 236.827, -131.838], [243.974, 259.248, -134.458], [248.677, 280.373, -134.322], [255.831, 304.567, -128.099], [269.248, 326.167, -112.87], [285.225, 341.938, -92.094], [304.994, 355.754, -73.5], [332.865, 362.672, -68.564], [359.732, 355.406, -78.179], [376.545, 341.978, -99.815], [389.448, 326.301, -122.888], [400.567, 304.756, -140.265], [407.064, 280.546, -147.611], [411.771, 259.254, -148.734], [416.278, 236.78, -147.115], [418.857, 211.973, -145.509], [263.748, 200.512, -49.779], [275.414, 195.24, -34.458], [289.357, 194.837, -24.709], [302.402, 197.126, -19.647], [314.0, 200.75, -18.196], [361.328, 200.435, -22.245], [372.607, 196.619, -25.738], [384.76, 194.23, -33.014], [397.26, 194.62, -44.893], [406.278, 200.253, -61.99], [337.812, 226.15, -21.475], [338.399, 243.253, -13.194], [339.027, 260.275, -4.428], [338.932, 273.49, -4.189], [321.414, 280.27, -31.601], [328.112, 282.361, -26.86], [336.838, 284.402, -25.349], [345.206, 282.397, -28.279], [350.999, 280.257, -34.091], [280.83, 220.306, -45.968], [289.787, 217.317, -35.5], [301.303, 217.37, -36.152], [311.534, 222.427, -41.114], [302.048, 225.573, -38.15], [289.814, 225.449, -40.113], [359.573, 222.369, -45.573], [370.554, 217.156, -42.509], [382.289, 217.254, -43.682], [389.687, 220.413, -55.394], [381.473, 225.253, -48.024], [369.61, 225.484, -44.15], [303.318, 308.395, -48.555], [315.767, 304.08, -34.042], [329.489, 300.392, -26.883], [336.535, 301.821, -26.9], [343.484, 300.47, -28.016], [355.738, 304.163, -37.402], [364.725, 308.537, -53.784], [354.655, 316.417, -42.404], [345.478, 321.333, -37.323], [335.39, 322.254, -35.393], [325.329, 321.238, -35.392], [315.827, 316.325, -38.967], [306.614, 308.028, -47.697], [326.762, 307.763, -34.71], [335.783, 307.824, -33.116], [344.478, 307.887, -36.237], [362.661, 308.147, -52.701], [344.09, 310.975, -36.712], [335.298, 311.642, -35.056], [326.529, 310.783, -35.374]],
+ "xi_1_0": [[167.718, 247.878, -212.37], [169.658, 286.821, -215.957], [175.457, 322.404, -220.066], [181.169, 355.633, -219.572], [189.946, 393.403, -209.309], [207.571, 427.234, -183.665], [229.209, 451.815, -148.935], [257.837, 473.612, -115.845], [301.243, 485.404, -102.666], [345.922, 476.015, -114.481], [377.359, 456.819, -146.624], [402.386, 434.023, -180.427], [423.428, 401.686, -205.35], [435.625, 364.622, -215.208], [443.923, 331.584, -215.924], [451.794, 296.432, -211.973], [456.7, 257.56, -207.989], [198.18, 231.621, -83.479], [214.64, 224.341, -57.709], [235.209, 224.366, -40.522], [254.914, 228.692, -30.772], [272.742, 235.041, -26.935], [347.535, 237.292, -25.905], [366.04, 231.817, -29.263], [386.391, 228.679, -38.451], [407.823, 230.077, -54.787], [424.36, 238.931, -80.047], [309.166, 275.175, -28.89], [307.936, 301.731, -16.441], [306.786, 327.817, -3.261], [305.958, 348.142, -3.42], [281.214, 356.232, -50.393], [291.441, 360.283, -42.164], [305.377, 364.131, -38.485], [319.688, 361.206, -41.728], [330.414, 357.778, -49.669], [223.693, 262.933, -75.628], [236.35, 258.698, -57.873], [254.368, 259.387, -57.057], [270.868, 267.844, -63.485], [255.339, 272.163, -60.334], [236.517, 271.288, -65.264], [347.289, 270.417, -62.876], [364.331, 262.846, -56.046], [382.803, 263.648, -56.046], [396.088, 268.99, -73.107], [381.93, 275.989, -63.111], [362.703, 275.757, -59.033], [248.931, 393.259, -85.576], [268.75, 389.72, -60.34], [292.459, 386.674, -45.745], [304.482, 389.481, -44.811], [316.651, 387.621, -45.289], [340.196, 392.3, -59.31], [358.871, 397.215, -84.167], [337.492, 409.493, -65.684], [320.184, 416.388, -57.259], [302.744, 417.26, -55.451], [285.723, 415.242, -57.656], [269.681, 407.22, -66.63], [253.838, 392.766, -84.267], [287.931, 396.662, -58.271], [303.918, 397.861, -54.387], [320.102, 398.04, -57.817], [355.635, 396.502, -83.165], [318.839, 400.882, -57.029], [303.065, 401.485, -55.234], [287.684, 399.58, -57.82]],
+ "xi_2_0": [[263.994, 350.494, -335.908], [264.648, 409.765, -334.863], [270.962, 464.113, -334.693], [277.191, 514.542, -327.663], [287.677, 570.492, -304.675], [311.609, 618.251, -258.779], [341.914, 650.256, -200.702], [382.679, 678.022, -145.019], [446.747, 695.157, -120.696], [514.868, 686.004, -138.158], [564.659, 665.123, -189.065], [605.55, 638.346, -243.069], [640.422, 594.893, -285.609], [661.037, 541.084, -306.793], [674.793, 491.619, -313.665], [687.457, 438.402, -313.455], [696.157, 379.361, -313.666], [305.471, 308.309, -144.539], [329.354, 294.665, -106.481], [359.363, 293.12, -79.859], [388.164, 299.288, -63.567], [414.32, 309.338, -55.825], [524.917, 316.37, -50.389], [553.03, 309.604, -55.494], [584.072, 307.265, -68.773], [616.752, 312.946, -91.851], [642.252, 330.452, -127.255], [466.327, 369.521, -50.429], [462.488, 406.514, -27.42], [458.871, 442.947, -3.028], [456.615, 473.202, 0.521], [421.294, 491.457, -69.687], [436.106, 496.827, -56.024], [456.621, 502.838, -48.996], [478.456, 499.54, -53.834], [495.291, 496.188, -65.96], [341.939, 354.949, -126.31], [360.224, 346.801, -100.028], [386.869, 348.462, -97.909], [411.269, 362.535, -105.412], [387.839, 367.661, -100.63], [360.148, 366.282, -108.944], [524.939, 370.246, -100.472], [550.249, 359.118, -90.595], [577.541, 361.402, -89.479], [597.84, 372.404, -113.212], [575.952, 380.423, -97.958], [547.293, 378.461, -92.998], [372.577, 551.537, -116.102], [401.493, 542.564, -78.928], [436.494, 536.82, -56.609], [454.451, 541.61, -54.133], [472.895, 539.381, -54.591], [508.648, 549.924, -73.564], [537.499, 562.675, -108.185], [503.73, 575.371, -78.827], [477.116, 582.732, -65.565], [451.07, 582.633, -63.506], [425.887, 579.387, -67.992], [402.572, 568.808, -83.769], [379.975, 550.621, -114.027], [429.879, 553.695, -73.686], [453.66, 555.8, -66.997], [478.195, 557.331, -71.293], [532.656, 561.122, -107.045], [475.962, 559.578, -68.564], [452.362, 559.215, -66.473], [429.617, 556.31, -71.284]],
+ "trudeau_3_0": [[397.686, 208.814, -210.855], [402.699, 237.911, -211.193], [409.992, 264.229, -210.693], [415.52, 288.756, -207.086], [420.868, 316.254, -195.469], [427.772, 339.633, -170.547], [434.576, 355.372, -138.639], [446.52, 368.58, -105.439], [473.38, 373.647, -82.404], [507.474, 363.709, -78.954], [537.925, 347.882, -93.776], [563.802, 330.042, -111.285], [583.308, 305.032, -124.457], [591.663, 276.585, -129.955], [594.89, 251.184, -130.211], [596.266, 224.179, -127.237], [595.314, 194.597, -124.964], [380.956, 193.312, -113.495], [384.342, 186.636, -91.307], [393.46, 184.834, -73.638], [404.408, 186.476, -61.069], [415.891, 189.86, -53.053], [466.307, 186.15, -31.315], [479.505, 180.744, -28.633], [495.8, 177.013, -29.359], [515.184, 176.762, -34.46], [534.389, 182.032, -46.779], [443.665, 215.911, -42.139], [440.957, 235.19, -32.422], [438.128, 253.922, -22.132], [439.012, 268.811, -21.335], [436.075, 276.444, -61.821], [441.29, 278.76, -52.847], [450.329, 280.591, -45.889], [461.292, 277.197, -44.192], [471.12, 273.729, -46.696], [398.533, 214.09, -99.196], [401.693, 209.818, -83.56], [413.591, 208.944, -77.94], [427.219, 213.946, -77.47], [416.034, 218.191, -79.341], [404.717, 219.02, -88.03], [479.255, 210.238, -55.344], [488.194, 203.406, -46.078], [500.649, 202.71, -40.865], [514.96, 205.853, -48.567], [503.026, 211.793, -45.295], [488.884, 212.993, -47.96], [425.274, 304.59, -98.025], [432.125, 300.504, -73.888], [445.261, 296.879, -55.461], [454.13, 298.117, -50.959], [463.139, 295.645, -47.637], [485.821, 296.693, -50.776], [507.634, 298.837, -62.894], [486.22, 310.47, -54.98], [470.851, 316.94, -52.852], [457.534, 318.983, -56.573], [445.709, 318.881, -63.699], [436.227, 314.196, -76.531], [428.278, 303.811, -96.215], [445.849, 304.2, -65.029], [456.954, 304.021, -57.097], [470.349, 302.651, -54.418], [505.304, 298.541, -63.411], [469.218, 306.066, -54.323], [456.775, 307.831, -57.565], [446.035, 307.553, -64.685]],
+ "trudeau_5_0": [[133.032, 212.479, -155.368], [136.227, 242.885, -156.729], [142.137, 270.474, -158.92], [148.069, 296.512, -157.954], [157.323, 326.195, -150.155], [174.447, 351.376, -131.207], [194.858, 368.78, -106.229], [220.202, 384.785, -83.386], [255.085, 391.802, -76.544], [287.659, 382.055, -89.686], [307.806, 365.125, -116.686], [322.824, 346.646, -144.623], [334.954, 320.787, -165.979], [341.107, 290.64, -175.0], [345.113, 263.982, -177.111], [349.151, 236.0, -176.173], [350.699, 205.313, -175.145], [165.2, 192.476, -59.091], [179.032, 184.981, -40.645], [195.682, 183.234, -28.886], [211.45, 185.122, -22.678], [225.446, 188.926, -20.833], [281.494, 187.011, -25.995], [294.775, 182.039, -30.374], [309.117, 179.038, -39.328], [323.923, 179.762, -53.72], [334.774, 186.671, -74.396], [254.736, 217.827, -23.231], [256.26, 237.977, -12.093], [257.91, 257.73, -0.627], [258.465, 273.613, 0.193], [235.964, 282.774, -35.735], [244.784, 285.12, -29.861], [256.171, 287.275, -27.903], [266.974, 284.312, -31.904], [274.555, 281.322, -39.33], [186.562, 214.966, -53.869], [197.188, 210.015, -41.226], [210.773, 209.583, -41.98], [223.095, 215.78, -48.102], [211.883, 219.753, -44.16], [197.346, 220.288, -46.524], [280.241, 213.909, -53.703], [293.052, 206.673, -49.947], [306.924, 206.454, -51.406], [315.904, 210.871, -65.593], [306.58, 216.536, -56.393], [292.427, 217.093, -51.675], [207.416, 314.517, -65.149], [225.172, 308.917, -44.799], [246.119, 304.816, -33.885], [256.293, 306.382, -34.035], [266.23, 304.199, -35.615], [285.018, 307.043, -50.391], [298.384, 312.147, -74.152], [282.999, 326.5, -57.479], [269.961, 333.844, -48.077], [255.609, 335.789, -44.775], [241.119, 334.806, -45.249], [226.676, 328.185, -52.118], [210.907, 314.167, -65.237], [241.652, 312.93, -43.167], [255.564, 312.88, -41.08], [269.05, 312.204, -45.602], [296.099, 311.979, -73.604], [268.102, 322.277, -48.409], [254.924, 323.907, -45.147], [241.533, 322.644, -46.457]]
+}
+
diff --git a/client/splash/face/all_faces_offsets.js b/client/splash/face/all_faces_offsets.js
new file mode 100644
index 00000000..94ef56a3
--- /dev/null
+++ b/client/splash/face/all_faces_offsets.js
@@ -0,0 +1,24 @@
+export default function offsets() {
+ return {
+ john_ashcroft_1_0: { x: -0.037, y: 0.066, z: -0.038, scale: 0.00008 },
+ bush_1_0: {"x": -0.05, "y": 0.066, "z": -0.038, "scale": 0.000045},
+ brad_smith_1_0: {"x":-0.081,"y":0.066,"z":-0.047,"scale":0.00013},
+ george_tenet_1_0: {"x":0.001,"y":0.065,"z":-0.034,"scale":0.00006},
+ macron_1_0: {"x":-0.062,"y":0.054,"z":-0.039,"scale":0.00024},
+ macron_2_0: {"x":-0.043,"y":0.051,"z":-0.051,"scale":0.00013},
+ macron_4_0: {"x":-0.089,"y":0.07,"z":-0.055,"scale":0.00012},
+ putin_0: {"x":-0.037,"y":0.066,"z":-0.038,"scale":0.00009},
+ putin_3_0: {"x":-0.048,"y":0.086,"z":-0.052,"scale":0.00019},
+ putin_4_0: {"x":-0.095,"y":0.063,"z":-0.044,"scale":0.00017},
+ trump_1_0: {"x":-0.14,"y":0.07,"z":-0.038,"scale":0.00023},
+ trump_2_0: {"x":-0.062,"y":0.081,"z":-0.044,"scale":0.00006},
+ trump_3_0: {"x":-0.06,"y":0.058,"z":-0.035,"scale":0.00006},
+ trump_4_0: {"x":-0.071,"y":0.078,"z":-0.058,"scale":0.0002},
+ xi_1_0: {"x":-0.055,"y":0.094,"z":-0.047,"scale":0.00019},
+ xi_2_0: {"x":-0.054,"y":0.085,"z":-0.046,"scale":0.00013},
+ trudeau_2_0: {"x":-0.152,"y":0.072,"z":-0.022,"scale":0.00008}, // freaky!!
+ trudeau_3_0: {"x":-0.039,"y":0.063,"z":-0.039,"scale":0.00017}, // has glitch
+ trudeau_4_0: {"x":-0.053,"y":0.071,"z":-0.047,"scale":0.00014},
+ trudeau_5_0: {"x":-0.056,"y":0.066,"z":-0.056,"scale":0.00019},
+ }
+} \ No newline at end of file
diff --git a/client/splash/face/editor.css b/client/splash/face/editor.css
new file mode 100644
index 00000000..32a192bd
--- /dev/null
+++ b/client/splash/face/editor.css
@@ -0,0 +1,11 @@
+.meshEditor {
+ position: fixed;
+ top: 20px;
+ right: 0;
+ display: flex;
+ flex-direction: column
+}
+.meshEditor label span {
+ display: inline-block;
+ width: 30px;
+}
diff --git a/client/splash/face/editor.js b/client/splash/face/editor.js
new file mode 100644
index 00000000..8263877b
--- /dev/null
+++ b/client/splash/face/editor.js
@@ -0,0 +1,120 @@
+import React, { Component } from 'react'
+import ReactDOM from 'react-dom'
+
+import { names, faces } from './faces'
+import * as markers from './markers'
+import * as mesh from './mesh'
+
+import './editor.css'
+
+import * as offsets from ' ./all_faces_offsets'
+
+const origin = { x: -0.037, y: 0.066, z: -0.038, scale: 0.00008 }
+
+class Editor extends Component {
+ state = {
+ name: "",
+ position: { ...origin },
+ mesh: null,
+ }
+
+ constructor() {
+ super()
+ setTimeout(() => { this.update('brad_smith_1_0') }, 100 )
+ }
+
+ update(name) {
+ console.log(name)
+ this.setState({ name })
+ const face = faces[name]
+ markers.swap(face)
+ mesh.load(name).then(geometry => {
+ let meshes = mesh.createFaceMeshes(geometry)
+ setTimeout(() => {
+ meshes.solid.material.opacity = 1
+ mesh.removeMesh('blank')
+ mesh.removeMesh('wireframe')
+ const savedPosition = offsets[name]
+ this.setState({
+ mesh: meshes.solid,
+ geometry: {
+ x: meshes.solid.position.x,
+ y: meshes.solid.position.y,
+ z: meshes.solid.position.z,
+ scale: meshes.solid.scale.x
+ },
+ position: { ...(savedPosition || origin) }
+ }, () => this.updatePosition())
+ }, 10)
+ })
+ }
+
+ updatePosition() {
+ const { geometry, position, mesh } = this.state
+ console.log(geometry, position)
+ // window['m'] = mesh
+ mesh.material.opacity = 1
+ mesh.position.setX(geometry.x + position.x)
+ mesh.position.setY(geometry.y + position.y)
+ mesh.position.setZ(geometry.z + position.z)
+ mesh.scale.setX(geometry.scale + position.scale)
+ mesh.scale.setY(geometry.scale + position.scale)
+ mesh.scale.setZ(geometry.scale + position.scale)
+ }
+ save() {
+ console.log(JSON.stringify({
+ [this.state.name]: this.state.position
+ }))
+ }
+
+ render() {
+ return (
+ <div className='meshEditor'>
+ <select value={this.state.name} onChange={e => this.update(e.target.value)}>
+ <option value="">Pick a name</option>
+ {names.sort().map(name => <option key={name} value={name}>{name}</option>)}
+ </select>
+ <label>
+ <span>x</span>
+ <input
+ type="number"
+ value={this.state.position.x}
+ min={-2} max={2} step={0.001}
+ onChange={e => this.setState({ position: { ...this.state.position, x: parseFloat(e.target.value) }}, () => this.updatePosition())}
+ />
+ </label>
+ <label>
+ <span>y</span>
+ <input
+ type="number"
+ value={this.state.position.y}
+ min={-2} max={2} step={0.001}
+ onChange={e => this.setState({ position: { ...this.state.position, y: parseFloat(e.target.value) }}, () => this.updatePosition())}
+ />
+ </label>
+ <label>
+ <span>z</span>
+ <input
+ type="number"
+ value={this.state.position.z}
+ min={-2} max={2} step={0.001}
+ onChange={e => this.setState({ position: { ...this.state.position, z: parseFloat(e.target.value) }}, () => this.updatePosition())}
+ />
+ </label>
+ <label>
+ <span>scale</span>
+ <input
+ type="number"
+ value={this.state.position.scale}
+ min={0} max={1.1} step={0.00001}
+ onChange={e => this.setState({ position: { ...this.state.position, scale: parseFloat(e.target.value) }}, () => this.updatePosition())}
+ />
+ </label>
+ <button onClick={() => this.save()}>Save</button>
+ </div>
+ )
+ }
+}
+
+ReactDOM.render(<Editor />, document.querySelector('.links'))
+document.querySelector('.teaser').remove() \ No newline at end of file
diff --git a/client/splash/face/faces.js b/client/splash/face/faces.js
index bab50c97..a1c7472a 100644
--- a/client/splash/face/faces.js
+++ b/client/splash/face/faces.js
@@ -1,13 +1,13 @@
+// unused faces (glitchy)
+// "trudeau_2_0": [[1041.093, 700.572, -463.59], [1063.846, 807.082, -449.615], [1092.7, 904.252, -444.726], [1126.229, 992.988, -431.207], [1182.26, 1087.821, -396.565], [1277.495, 1158.882, -341.658], [1388.709, 1198.173, -277.299], [1511.726, 1231.473, -229.9], [1638.04, 1249.375, -254.714], [1722.291, 1224.982, -350.437], [1742.757, 1189.926, -478.76], [1743.227, 1148.295, -605.067], [1741.084, 1075.617, -711.854], [1735.372, 979.583, -774.197], [1734.798, 889.51, -807.795], [1737.766, 791.756, -832.095], [1731.659, 684.349, -854.959], [1274.804, 553.971, -221.295], [1343.155, 511.548, -190.623], [1414.273, 495.694, -180.059], [1476.0, 497.181, -182.542], [1526.682, 509.108, -194.727], [1704.727, 504.387, -296.303], [1740.364, 489.687, -333.554], [1773.952, 485.524, -385.353], [1803.33, 498.789, -452.196], [1814.296, 540.602, -527.227], [1633.399, 614.348, -224.257], [1662.775, 675.943, -176.463], [1693.214, 735.74, -127.446], [1703.352, 790.371, -113.239], [1588.159, 852.277, -180.966], [1625.455, 854.906, -173.755], [1665.208, 860.229, -182.372], [1692.55, 853.014, -212.094], [1704.951, 848.903, -247.893], [1363.569, 629.373, -218.087], [1414.384, 602.624, -197.941], [1458.304, 601.58, -221.235], [1493.371, 626.731, -253.888], [1463.561, 638.229, -222.009], [1412.372, 642.199, -207.253], [1675.19, 622.896, -358.855], [1719.736, 595.172, -371.91], [1763.762, 594.823, -397.345], [1775.397, 620.477, -451.715], [1759.444, 633.597, -404.423], [1719.592, 632.468, -368.297], [1491.078, 990.332, -192.674], [1567.297, 952.859, -163.279], [1639.527, 927.361, -164.747], [1670.947, 932.289, -177.69], [1697.706, 926.118, -197.62], [1736.357, 949.027, -259.961], [1748.215, 985.446, -340.349], [1731.164, 1013.233, -263.0], [1706.406, 1030.213, -215.81], [1668.193, 1034.126, -186.274], [1624.116, 1031.754, -167.987], [1570.858, 1016.362, -170.748], [1504.162, 987.74, -196.937], [1618.877, 966.106, -181.222], [1661.957, 963.362, -193.569], [1694.942, 964.818, -224.488], [1741.469, 983.503, -333.936], [1694.25, 987.75, -222.391], [1660.171, 990.569, -195.743], [1619.811, 988.593, -181.174]],
+// "trudeau_4_0": [[192.086, 314.576, -235.453], [196.354, 358.107, -234.921], [204.669, 397.637, -235.688], [212.934, 435.129, -232.075], [225.206, 477.875, -217.977], [247.939, 513.796, -187.36], [274.73, 538.4, -148.111], [308.503, 561.276, -112.162], [358.175, 571.962, -98.951], [406.831, 558.972, -114.612], [438.577, 535.886, -151.96], [463.406, 510.548, -191.951], [483.844, 474.302, -223.278], [494.422, 431.227, -237.631], [501.088, 393.06, -241.873], [507.364, 353.138, -241.953], [510.11, 309.278, -242.491], [229.457, 281.21, -93.727], [247.811, 269.564, -66.079], [270.844, 266.808, -47.33], [293.091, 269.427, -36.518], [313.195, 274.949, -32.059], [395.352, 273.363, -33.92], [415.172, 266.851, -39.397], [436.958, 263.356, -51.233], [459.873, 265.367, -70.677], [477.533, 276.78, -99.113], [355.574, 317.319, -30.777], [356.306, 345.708, -13.061], [357.191, 373.718, 5.123], [357.614, 396.621, 7.537], [328.788, 412.065, -45.655], [340.733, 415.028, -35.974], [356.822, 418.123, -31.802], [372.74, 414.437, -36.67], [384.286, 410.947, -46.962], [259.516, 313.806, -82.416], [273.798, 306.286, -63.322], [293.709, 305.942, -63.09], [312.127, 315.301, -70.244], [295.38, 320.63, -65.46], [274.438, 321.301, -70.343], [395.745, 313.905, -72.709], [414.12, 303.641, -66.511], [434.495, 303.667, -67.201], [448.811, 310.887, -86.607], [434.206, 318.389, -73.843], [413.174, 318.632, -68.381], [292.259, 461.633, -86.451], [315.014, 451.359, -55.74], [342.908, 444.286, -38.585], [357.244, 446.646, -37.579], [371.463, 443.868, -39.054], [398.803, 450.106, -57.726], [419.461, 460.473, -90.154], [396.762, 479.826, -68.031], [377.594, 489.897, -56.301], [356.893, 492.263, -53.069], [336.45, 490.476, -54.984], [317.218, 480.773, -65.881], [297.453, 461.228, -85.993], [337.737, 457.067, -52.111], [356.788, 456.854, -47.6], [375.939, 456.635, -52.855], [416.008, 460.147, -89.436], [374.914, 472.927, -57.366], [356.149, 474.835, -54.214], [337.632, 472.785, -57.231]],
+
import { recenter } from './util'
-const rawFaces = {
- putin: [[6.229589182834997700e02, 1.237765302967744901e03, 4.134526977539062500e02], [6.376896424835800872e02, 1.410526376450482758e03, 3.891479492187500000e02], [6.739611274719236462e02, 1.582250497753667105e03, 3.769988098144531250e02], [7.100658831128885140e02, 1.741763669768688942e03, 3.758922424316406250e02], [7.536649862551219030e02, 1.917029460341510003e03, 4.252069091796875000e02], [8.298141803217866936e02, 2.059907416716931493e03, 5.431895141601562500e02], [9.258791576609889944e02, 2.164709160946117208e03, 7.162614746093750000e02], [1.070414319266524672e03, 2.251194729721967633e03, 8.754176635742187500e02], [1.274411328424191879e03, 2.298006267580519307e03, 9.157481689453125000e02], [1.458846686449237723e03, 2.247376503427543867e03, 8.904161376953125000e02], [1.613419451724781766e03, 2.154859059460210574e03, 7.340153198242187500e02], [1.719510602704216581e03, 2.046877580339021051e03, 5.658121948242187500e02], [1.802992956004423377e03, 1.898674323395374358e03, 4.472657165527343750e02], [1.839803416592467329e03, 1.728563973209157211e03, 4.044224853515625000e02], [1.867230816650390807e03, 1.567819041550580550e03, 4.134500732421875000e02], [1.892678734334310093e03, 1.401836273899452635e03, 4.331260375976562500e02], [1.900552931542490114e03, 1.223502216072830606e03, 4.526267700195312500e02], [7.511424780752142851e02, 1.160890923207600963e03, 1.001351135253906250e03], [8.158950379315542705e02, 1.135870041375253777e03, 1.114991333007812500e03], [9.076874701406441091e02, 1.127822704063864421e03, 1.194016601562500000e03], [9.926902658799115216e02, 1.143210580432368261e03, 1.233907104492187500e03], [1.063656488096947669e03, 1.162017750208237658e03, 1.248264404296875000e03], [1.395103497613645231e03, 1.151143294423421366e03, 1.261149414062500000e03], [1.466387226179534309e03, 1.130542678432090725e03, 1.248993530273437500e03], [1.552676099051681376e03, 1.115153013015447868e03, 1.213308837890625000e03], [1.652305108762255031e03, 1.120968661861045803e03, 1.146292236328125000e03], [1.727642721019071814e03, 1.143332434488932449e03, 1.041585449218750000e03], [1.244122246476715645e03, 1.334647129869648325e03, 1.250885375976562500e03], [1.249189824721392597e03, 1.465660963816923413e03, 1.309278930664062500e03], [1.252202780570235745e03, 1.585706690278895167e03, 1.358756103515625000e03], [1.259493648693608066e03, 1.685694304749732282e03, 1.360432617187500000e03], [1.148455034173703552e03, 1.740496228553921810e03, 1.155312866210937500e03], [1.194674198315190097e03, 1.755804119561887546e03, 1.196942993164062500e03], [1.258795422961665054e03, 1.777236518698300188e03, 1.212644042968750000e03], [1.305280558926451249e03, 1.757635707289752190e03, 1.198189453125000000e03], [1.356348142915613380e03, 1.737675595379997958e03, 1.164412109375000000e03], [8.664502087162989028e02, 1.296397628532858562e03, 1.039572875976562500e03], [9.217092343199485640e02, 1.262228697521733466e03, 1.107280639648437500e03], [9.986516724530387137e02, 1.265434423307531233e03, 1.120204345703125000e03], [1.074714246772317438e03, 1.306653943337833425e03, 1.091015014648437500e03], [1.007696155622893571e03, 1.330022539822447698e03, 1.095014892578125000e03], [9.264212392470415125e02, 1.326119930090810840e03, 1.079521362304687500e03], [1.405216489784390433e03, 1.300602885574640140e03, 1.104635620117187500e03], [1.476379755775601325e03, 1.256362955328249654e03, 1.138428955078125000e03], [1.554564041795917774e03, 1.249119944242589781e03, 1.133978515625000000e03], [1.616356373027726704e03, 1.280854080128389342e03, 1.071557495117187500e03], [1.554167071892233480e03, 1.313725106410606259e03, 1.107841308593750000e03], [1.472497819489123913e03, 1.322406412808287541e03, 1.114204223632812500e03], [1.037582353868671362e03, 1.936206664907418599e03, 1.033433837890625000e03], [1.116472667858647128e03, 1.915096195044424576e03, 1.131442626953125000e03], [1.209116239719764735e03, 1.900456612907858926e03, 1.186649047851562500e03], [1.263021651623295838e03, 1.914385048409256797e03, 1.188636718750000000e03], [1.300469609698127215e03, 1.904690494719861135e03, 1.189560302734375000e03], [1.398002848905675364e03, 1.918324532410865231e03, 1.142420776367187500e03], [1.480066685814951143e03, 1.930527828548656316e03, 1.061488159179687500e03], [1.389899255969477508e03, 1.978273845885034234e03, 1.124004760742187500e03], [1.327246293191348741e03, 2.005233211071538562e03, 1.142569091796875000e03], [1.262139949065563542e03, 2.009971803241804992e03, 1.149364868164062500e03], [1.180817821697160070e03, 2.011372329759785316e03, 1.134800781250000000e03], [1.120554480578852463e03, 1.984728334003523742e03, 1.106011474609375000e03], [1.061098198954264262e03, 1.933346772066004633e03, 1.042356811523437500e03], [1.192023425322887761e03, 1.945863449802773175e03, 1.133595458984375000e03], [1.264533596083696921e03, 1.947978800443761884e03, 1.155409667968750000e03], [1.322869685094496617e03, 1.947868674591663421e03, 1.140181640625000000e03], [1.466934774301566449e03, 1.932516156771791202e03, 1.067155761718750000e03], [1.321161541688208445e03, 1.941148711607690529e03, 1.139805419921875000e03], [1.264645510983934400e03, 1.947900976849724657e03, 1.145079345703125000e03], [1.191629635949228032e03, 1.946293020139208465e03, 1.132726318359375000e03]],
- xi: [[1.581475713243671350e02, 2.509900304577397208e02, 1.024322662353515625e02], [1.602838203130983743e02, 2.899340435970530621e02, 9.691181182861328125e01], [1.677042909659591032e02, 3.286639095949659009e02, 9.189924621582031250e01], [1.748665216932109558e02, 3.625784639964384155e02, 9.149455261230468750e01], [1.847612098245059542e02, 3.980092255955116229e02, 1.006391220092773438e02], [2.038414167516371549e02, 4.305498111620136115e02, 1.265865783691406250e02], [2.267264444687787091e02, 4.546917949123007929e02, 1.604735412597656250e02], [2.612276697794596316e02, 4.780719417916091629e02, 1.935450286865234375e02], [3.090068905699486663e02, 4.907490536080154016e02, 2.012679595947265625e02], [3.518451845056870297e02, 4.797107582361557547e02, 1.910112304687500000e02], [3.847857219621247395e02, 4.564630420879288408e02, 1.558248138427734375e02], [4.103254317339729482e02, 4.305017980957030659e02, 1.197048492431640625e02], [4.318702770756740392e02, 3.973330254169538307e02, 9.420705413818359375e01], [4.422064956365847479e02, 3.622428712253944241e02, 8.656275177001953125e01], [4.490620300891353054e02, 3.271828325578277941e02, 8.970116424560546875e01], [4.560659534529144139e02, 2.910778101423675253e02, 9.644176483154296875e01], [4.601242073208678676e02, 2.548580883071001892e02, 1.051369400024414062e02], [1.962528726615157666e02, 2.332017434931736375e02, 2.350029449462890625e02], [2.121071722591624393e02, 2.262617082603305221e02, 2.581283569335937500e02], [2.337514653224571362e02, 2.251718836885340238e02, 2.734199218750000000e02], [2.531733047485351449e02, 2.294949851660634863e02, 2.820414123535156250e02], [2.699339236988740822e02, 2.343355223233092204e02, 2.848821716308593750e02], [3.455108120787377857e02, 2.358723006125057395e02, 2.856489868164062500e02], [3.613513837627336329e02, 2.322616238283643497e02, 2.837029724121093750e02], [3.815044319900812297e02, 2.292742164881089195e02, 2.767124328613281250e02], [4.047670535218482541e02, 2.327066104784198899e02, 2.606012268066406250e02], [4.217962602802351739e02, 2.402466705142750527e02, 2.363506011962890625e02], [3.089879679361979470e02, 2.760715659167719878e02, 2.821576232910156250e02], [3.093649245318244425e02, 3.046348659859451118e02, 2.941600341796875000e02], [3.114766959994447006e02, 3.293608332435757120e02, 3.046447143554687500e02], [3.122007153080958801e02, 3.512138293816061605e02, 3.057337951660156250e02], [2.828070219152114078e02, 3.584083089312384800e02, 2.589963073730468750e02], [2.940082791197533538e02, 3.623387865373199475e02, 2.662980346679687500e02], [3.092972130868948852e02, 3.668293242331112083e02, 2.692637634277343750e02], [3.198154823452819073e02, 3.628364545754824917e02, 2.664876708984375000e02], [3.327329919553270656e02, 3.587899754064222861e02, 2.584887084960937500e02], [2.224500400618010758e02, 2.660715080829695012e02, 2.413853302001953125e02], [2.361075687184053322e02, 2.595814741366517637e02, 2.553526916503906250e02], [2.531863677380131890e02, 2.604359155512790949e02, 2.575644531250000000e02], [2.701898918002259506e02, 2.695448503202550228e02, 2.497847900390625000e02], [2.550828977098652217e02, 2.744724371337890716e02, 2.524707183837890625e02], [2.360909179089115923e02, 2.732695200422698463e02, 2.497717590332031250e02], [3.453027739281748154e02, 2.714797381053251684e02, 2.498313293457031250e02], [3.623781652113971177e02, 2.630507298607919893e02, 2.577862548828125000e02], [3.801104738721660965e02, 2.626405963194604283e02, 2.570069580078125000e02], [3.942162860945159650e02, 2.698504937983494187e02, 2.416210479736328125e02], [3.801208079020182709e02, 2.762396809117934140e02, 2.497300720214843750e02], [3.607991919424019898e02, 2.768305075970818052e02, 2.518104248046875000e02], [2.491371596093271137e02, 3.952959470980774768e02, 2.243894042968750000e02], [2.708619362027037027e02, 3.908969472967409047e02, 2.487248382568359375e02], [2.956859382180606417e02, 3.884492228908164293e02, 2.622833557128906250e02], [3.090222115310967865e02, 3.917322305836396481e02, 2.625950012207031250e02], [3.181707092883540327e02, 3.897191172401577433e02, 2.624730224609375000e02], [3.430552471086090804e02, 3.928625462670419211e02, 2.471974639892578125e02], [3.613266984528186754e02, 3.978334362673291480e02, 2.215844879150390625e02], [3.386838139552696134e02, 4.127940916293274540e02, 2.407136993408203125e02], [3.237892077277688827e02, 4.194459653487859327e02, 2.482334289550781250e02], [3.079967322256050579e02, 4.202518811513862715e02, 2.512642974853515625e02], [2.868524067299038620e02, 4.193043642051546840e02, 2.499754791259765625e02], [2.717448862412396693e02, 4.119777032710056233e02, 2.416939392089843750e02], [2.543327108644971304e02, 3.948142095348881071e02, 2.252314910888671875e02], [2.901215895409677614e02, 3.978477875473919880e02, 2.505760803222656250e02], [3.087859695135378502e02, 3.988037545716528598e02, 2.547194671630859375e02], [3.235175030876608844e02, 3.988561727606081035e02, 2.500653839111328125e02], [3.580007754456763678e02, 3.984504858996821213e02, 2.228356323242187500e02], [3.221863525989008963e02, 4.030397094247854852e02, 2.482552185058593750e02], [3.081756245332605317e02, 4.048862038526347646e02, 2.513024139404296875e02], [2.894371609257716500e02, 4.031360126091451548e02, 2.486108093261718750e02]],
- may: [[2.382511024026309201e02, 2.801454149852079922e02, 5.214575576782226562e01], [2.493454499637378774e02, 3.064797704180549545e02, 5.088167190551757812e01], [2.639089957742129400e02, 3.319260479018267915e02, 5.266226196289062500e01], [2.761821218154009330e02, 3.563184045051126532e02, 5.502143859863281250e01], [2.895152865241554991e02, 3.809634247544232721e02, 6.649546051025390625e01], [3.060860955631030720e02, 4.000378012982537257e02, 9.035191345214843750e01], [3.213366342881146238e02, 4.128964293356502822e02, 1.197938156127929688e02], [3.427375466739429157e02, 4.230581409050437287e02, 1.479590148925781250e02], [3.741586932014016043e02, 4.234630673397289229e02, 1.611701660156250000e02], [4.023389876421759936e02, 4.080303395708870084e02, 1.599018707275390625e02], [4.257357296214383950e02, 3.868248218132467855e02, 1.410530548095703125e02], [4.422483188404756334e02, 3.651947661276425379e02, 1.185040130615234375e02], [4.545492390352137022e02, 3.384910384952321465e02, 1.011212463378906250e02], [4.562152171415440876e02, 3.097211315199908768e02, 9.170339202880859375e01], [4.545628575942095608e02, 2.840973517743279331e02, 8.920196533203125000e01], [4.518868203555836089e02, 2.565134695434570631e02, 8.989577484130859375e01], [4.476127057243795662e02, 2.289923642596077116e02, 9.148764801025390625e01], [2.440917306787826817e02, 2.537266974774529444e02, 1.485117950439453125e02], [2.505385673074160877e02, 2.449884134449678754e02, 1.672230224609375000e02], [2.629362676283892029e02, 2.388631448005227753e02, 1.830232696533203125e02], [2.764214070039636226e02, 2.376199662870519660e02, 1.927939453125000000e02], [2.886053881476906895e02, 2.378487686426499863e02, 1.978783874511718750e02], [3.423349636302274348e02, 2.245833317745433533e02, 2.082518310546875000e02], [3.541764831542968750e02, 2.182193829974006576e02, 2.078261871337890625e02], [3.692832874971277306e02, 2.125500047392004035e02, 2.033292694091796875e02], [3.884832659553078429e02, 2.116430788197237121e02, 1.939130706787109375e02], [4.040244427849264639e02, 2.158026554152545202e02, 1.781080627441406250e02], [3.225035565544576457e02, 2.592519715971105825e02, 2.056854705810546875e02], [3.248514710370232024e02, 2.779033468627930006e02, 2.160809936523437500e02], [3.270475357055663608e02, 2.946293671372358176e02, 2.269593200683593750e02], [3.308855010986327443e02, 3.100248983764648756e02, 2.303575286865234375e02], [3.207017386043772831e02, 3.250651369700713076e02, 1.937343902587890625e02], [3.269732386869542324e02, 3.255231738640280810e02, 2.018161010742187500e02], [3.372413344439337948e02, 3.264521555103975743e02, 2.067531127929687500e02], [3.444994117288027837e02, 3.217518894689223998e02, 2.058569641113281250e02], [3.539391475901883837e02, 3.172060759420955947e02, 2.011738739013671875e02], [2.669883459652170927e02, 2.717859535486558116e02, 1.602029724121093750e02], [2.727741014368393166e02, 2.638736764167337014e02, 1.725038604736328125e02], [2.851500773710362182e02, 2.613269290520163395e02, 1.773946533203125000e02], [2.994385292502009861e02, 2.645952199419807584e02, 1.756203308105468750e02], [2.895026475794174416e02, 2.709050594374713228e02, 1.749083251953125000e02], [2.761346585442037735e02, 2.735916131232767157e02, 1.694635925292968750e02], [3.532332682890050251e02, 2.518493531889074291e02, 1.864256134033203125e02], [3.633393915512982630e02, 2.427597525921990211e02, 1.922457427978515625e02], [3.761221859202665314e02, 2.392758025045956174e02, 1.929562835693359375e02], [3.890149852079503034e02, 2.427061907420439297e02, 1.852474365234375000e02], [3.783926052317899575e02, 2.491870305498908920e02, 1.901230163574218750e02], [3.645112599092370829e02, 2.528680367682962356e02, 1.894682617187500000e02], [3.149588652666876669e02, 3.656840930534812060e02, 1.685671386718750000e02], [3.209378256405100274e02, 3.546107831887638326e02, 1.896470184326171875e02], [3.335197990866267901e02, 3.465708392693014730e02, 2.029352569580078125e02], [3.426302308924057343e02, 3.463943742460363637e02, 2.055313262939453125e02], [3.487268890380859148e02, 3.431470490220013971e02, 2.064477233886718750e02], [3.683972360049976942e02, 3.438066943718405355e02, 1.994532775878906250e02], [3.876000764734604331e02, 3.492489317770565549e02, 1.836993255615234375e02], [3.744968906178193038e02, 3.656988448917164760e02, 1.932265167236328125e02], [3.646742408303653065e02, 3.739269323730468955e02, 1.959875488281250000e02], [3.539474262910730431e02, 3.774166064812155810e02, 1.956282958984375000e02], [3.400370959113625418e02, 3.795127504954618871e02, 1.915529479980468750e02], [3.295073663150562311e02, 3.757046441291360566e02, 1.844334564208984375e02], [3.180933715820311818e02, 3.644562714341108176e02, 1.699502258300781250e02], [3.342565650491152951e02, 3.568250763657514426e02, 1.932405548095703125e02], [3.456540888169232062e02, 3.534686874210133283e02, 1.999556121826171875e02], [3.567734405517577443e02, 3.518089711626838607e02, 1.987718353271484375e02], [3.853768515194162774e02, 3.501925692210478473e02, 1.839606781005859375e02], [3.596766138413372573e02, 3.610454082533892688e02, 1.959595794677734375e02], [3.495193201401654051e02, 3.635478616871553754e02, 1.955101776123046875e02], [3.382061392391428853e02, 3.660274766630285512e02, 1.905125427246093750e02]],
-}
+import * as faces from './all_faces.json'
-export const names = Object.keys(rawFaces)
+const names = Object.keys(faces).filter(name => name !== 'default')
-export const faces = rawFaces
+export { names, faces }
// names.map(name => faces[name] = recenter(rawFaces[name]))
diff --git a/client/splash/face/faces.json b/client/splash/face/faces.json
new file mode 100644
index 00000000..796c04bf
--- /dev/null
+++ b/client/splash/face/faces.json
@@ -0,0 +1,4 @@
+{
+ "trudeau_4_0": [[192.086, 314.576, -235.453], [196.354, 358.107, -234.921], [204.669, 397.637, -235.688], [212.934, 435.129, -232.075], [225.206, 477.875, -217.977], [247.939, 513.796, -187.36], [274.73, 538.4, -148.111], [308.503, 561.276, -112.162], [358.175, 571.962, -98.951], [406.831, 558.972, -114.612], [438.577, 535.886, -151.96], [463.406, 510.548, -191.951], [483.844, 474.302, -223.278], [494.422, 431.227, -237.631], [501.088, 393.06, -241.873], [507.364, 353.138, -241.953], [510.11, 309.278, -242.491], [229.457, 281.21, -93.727], [247.811, 269.564, -66.079], [270.844, 266.808, -47.33], [293.091, 269.427, -36.518], [313.195, 274.949, -32.059], [395.352, 273.363, -33.92], [415.172, 266.851, -39.397], [436.958, 263.356, -51.233], [459.873, 265.367, -70.677], [477.533, 276.78, -99.113], [355.574, 317.319, -30.777], [356.306, 345.708, -13.061], [357.191, 373.718, 5.123], [357.614, 396.621, 7.537], [328.788, 412.065, -45.655], [340.733, 415.028, -35.974], [356.822, 418.123, -31.802], [372.74, 414.437, -36.67], [384.286, 410.947, -46.962], [259.516, 313.806, -82.416], [273.798, 306.286, -63.322], [293.709, 305.942, -63.09], [312.127, 315.301, -70.244], [295.38, 320.63, -65.46], [274.438, 321.301, -70.343], [395.745, 313.905, -72.709], [414.12, 303.641, -66.511], [434.495, 303.667, -67.201], [448.811, 310.887, -86.607], [434.206, 318.389, -73.843], [413.174, 318.632, -68.381], [292.259, 461.633, -86.451], [315.014, 451.359, -55.74], [342.908, 444.286, -38.585], [357.244, 446.646, -37.579], [371.463, 443.868, -39.054], [398.803, 450.106, -57.726], [419.461, 460.473, -90.154], [396.762, 479.826, -68.031], [377.594, 489.897, -56.301], [356.893, 492.263, -53.069], [336.45, 490.476, -54.984], [317.218, 480.773, -65.881], [297.453, 461.228, -85.993], [337.737, 457.067, -52.111], [356.788, 456.854, -47.6], [375.939, 456.635, -52.855], [416.008, 460.147, -89.436], [374.914, 472.927, -57.366], [356.149, 474.835, -54.214], [337.632, 472.785, -57.231]],
+ "putin_4_0": [[451.195, 211.212, -229.643], [452.813, 250.2, -229.218], [458.195, 285.904, -229.351], [463.302, 318.714, -225.143], [470.781, 354.919, -210.508], [486.076, 385.829, -180.774], [504.976, 406.682, -142.792], [531.132, 424.568, -106.267], [572.762, 435.183, -89.618], [617.446, 427.551, -99.76], [650.734, 412.621, -131.713], [677.724, 393.895, -165.974], [700.337, 364.706, -192.697], [713.438, 329.329, -205.657], [722.108, 296.861, -209.338], [730.011, 261.702, -208.539], [735.138, 222.772, -208.152], [473.964, 182.996, -103.697], [488.839, 173.365, -78.499], [508.113, 171.845, -60.715], [526.848, 175.435, -49.746], [544.054, 181.652, -44.458], [617.247, 184.383, -39.113], [635.694, 179.29, -41.796], [656.271, 177.137, -49.848], [678.294, 180.301, -64.318], [695.975, 191.758, -86.943], [579.314, 221.793, -40.449], [577.015, 246.688, -25.872], [574.768, 271.003, -10.427], [573.694, 291.027, -8.534], [552.151, 303.404, -54.199], [561.638, 306.687, -45.281], [574.924, 310.24, -40.561], [589.073, 307.737, -43.242], [600.086, 305.213, -50.658], [498.211, 213.522, -91.393], [509.65, 207.834, -73.881], [527.245, 208.574, -72.067], [543.682, 217.545, -76.566], [528.234, 221.409, -73.916], [510.106, 220.858, -79.79], [618.845, 220.691, -71.46], [635.251, 212.815, -64.6], [653.318, 213.749, -63.468], [667.284, 220.686, -78.684], [652.664, 226.502, -69.114], [633.627, 225.769, -66.309], [522.825, 343.674, -84.3], [540.573, 337.596, -59.893], [562.528, 333.112, -45.247], [574.051, 335.878, -43.415], [585.829, 334.176, -43.443], [609.125, 340.506, -54.86], [628.291, 348.054, -76.63], [606.552, 357.065, -58.615], [589.385, 362.565, -50.911], [572.605, 363.029, -50.07], [556.453, 361.247, -53.231], [541.625, 354.504, -63.321], [527.65, 342.977, -82.609], [558.887, 344.448, -56.461], [573.93, 345.337, -51.861], [589.59, 345.976, -54.233], [625.01, 347.124, -75.809], [588.259, 347.043, -52.402], [573.157, 347.244, -51.533], [558.665, 345.724, -54.837]]
+} \ No newline at end of file
diff --git a/client/splash/face/index.js b/client/splash/face/index.js
index 46b7b847..9312cc52 100644
--- a/client/splash/face/index.js
+++ b/client/splash/face/index.js
@@ -4,12 +4,19 @@ import { faces, names } from './faces'
import * as markers from './markers'
import * as mesh from './mesh'
+// import * as Editor from './editor'
+import offsets from './all_faces_offsets'
+
+const faceOffsets = offsets()
+const animating = true
+
export function init() {
const name = choice(names)
const face = faces[name]
markers.build(face)
- // mesh.load(name)
- startAnimation()
+ if (animating) {
+ startAnimation()
+ }
}
export function startAnimation() {
@@ -23,7 +30,7 @@ export function startAnimation() {
obj: {},
duration: 0,
finished: () => {
- meshes = mesh.createFaceMeshes(geometry)
+ meshes = mesh.createFaceMeshes(geometry, faceOffsets[name])
meshes.wireframe.position.z -= 0.001
}
})
diff --git a/client/splash/face/mesh.js b/client/splash/face/mesh.js
index 6561964b..6e9cbf33 100644
--- a/client/splash/face/mesh.js
+++ b/client/splash/face/mesh.js
@@ -34,11 +34,11 @@ export function update(name) {
load(name)
}
-export function createFaceMeshes(geometry) {
+export function createFaceMeshes(geometry, offset) {
return {
- blank: createBlankFace(geometry),
- wireframe: createWireframeFace(geometry),
- solid: createSolidFace(geometry),
+ blank: createBlankFace(geometry, offset),
+ wireframe: createWireframeFace(geometry, offset),
+ solid: createSolidFace(geometry, offset),
}
}
export function remove() {
@@ -52,7 +52,7 @@ export function removeMesh(name) {
scene.remove(selectedObject)
}
-function createBlankFace(geometry) {
+function createBlankFace(geometry, offset) {
const material = new MeshStandardMaterial({
color: 0xFFFFFF,
metalness: 0.2,
@@ -63,10 +63,10 @@ function createBlankFace(geometry) {
material.transparent = true
material.opacity = 0
material.side = DoubleSide
- return appendFace('blank', geometry, material)
+ return appendFace('blank', geometry, material, offset)
}
-function createWireframeFace(geometry) {
+function createWireframeFace(geometry, offset) {
const material = new MeshBasicMaterial({
vertexColors: VertexColors,
alphaTest: 0.01,
@@ -74,18 +74,18 @@ function createWireframeFace(geometry) {
material.wireframe = true
material.transparent = true
material.opacity = 0
- return appendFace('wireframe', geometry, material)
+ return appendFace('wireframe', geometry, material, offset)
}
-function createSolidFace(geometry) {
+function createSolidFace(geometry, offset) {
const material = new MeshBasicMaterial({ vertexColors: VertexColors })
material.transparent = true
material.opacity = 0
material.side = DoubleSide
- return appendFace('solid', geometry, material)
+ return appendFace('solid', geometry, material, offset)
}
-function appendFace(name, bufferGeometry, material) {
+function appendFace(name, bufferGeometry, material, offset) {
// If the position attribute is quantized, modify the material to perform
// dequantization on the GPU.
if (bufferGeometry.attributes.position.isQuantized) {
@@ -110,13 +110,17 @@ function appendFace(name, bufferGeometry, material) {
const bbox = bufferGeometry.boundingBox
const { scale, midX, midY, midZ } = getBboxScaleAndCentroid(bbox, bufferGeometry.attributes.position)
geometry.scale.multiplyScalar(scale * FACE_SCALE)
- geometry.position.x = -midX * scale
- geometry.position.y = -midY * scale
- geometry.position.z = -midZ * scale
+ geometry.position.x = -midX * scale + offset.x
+ geometry.position.y = -midY * scale + offset.y
+ geometry.position.z = -midZ * scale + offset.z
geometry.frustumCulled = false
// geometry.castShadow = true
// geometry.receiveShadow = true
+ geometry.scale.setX(geometry.scale.x + offset.scale)
+ geometry.scale.setY(geometry.scale.y + offset.scale)
+ geometry.scale.setZ(geometry.scale.z + offset.scale)
+
const selectedObject = scene.getObjectByName(name)
scene.remove(selectedObject)
geometry.name = name
diff --git a/megapixels/commands/misc/obj2ply.py b/megapixels/commands/misc/obj2ply.py
index 61fdefbd..cd956365 100644
--- a/megapixels/commands/misc/obj2ply.py
+++ b/megapixels/commands/misc/obj2ply.py
@@ -11,11 +11,12 @@ import click
@click.option('-u', '--unwind/--wind', 'unwind', default=False, help='pass to reverse winding order on faces (if surface normals are upside down)')
@click.option('-y', '--flip_y/--no_flip_y', 'flip_y', default=False, help='flip Y axis')
@click.option('-z', '--flip_z/--no_flip_z', 'flip_z', default=False, help='flip Z axis')
-@click.option('-s', '--swap_xy/--no_swap_xy', 'swap_xy', default=False, help='swap axes so things rotate correctly')
+@click.option('-s', '--swap_xy/--no_swap_xy', 'swap_xy', default=False, help='swap x/y axes so things rotate correctly')
+@click.option('-z', '--swap_xz/--no_swap_xz', 'swap_xz', default=False, help='swap x/z axes so things rotate correctly')
@click.option('-i', '--input_fn', required=True, help='input OBJ filename')
@click.option('-o', '--output_fn', help='output PLY filename')
@click.pass_context
-def cli(ctx, float_colors, unwind, flip_y, flip_z, swap_xy, input_fn, output_fn):
+def cli(ctx, float_colors, unwind, flip_y, flip_z, swap_xy, swap_xz, input_fn, output_fn):
"""
click command for converting OBJ to PLY
"""
@@ -44,12 +45,16 @@ def cli(ctx, float_colors, unwind, flip_y, flip_z, swap_xy, input_fn, output_fn)
for line in f.readlines():
N = line.strip().split(' ')
if N[0] == 'v':
- if flip_y:
- N[2] = str(float(N[2]) * -1)
if swap_xy:
tmp = N[2]
N[2] = N[1]
N[1] = tmp
+ if flip_y:
+ N[2] = str(float(N[2]) * -1)
+ if swap_xz:
+ tmp = N[3]
+ N[3] = N[1]
+ N[1] = tmp
if flip_z:
N[2] = str(float(N[2]) * -1)
if float_colors:
diff --git a/package-lock.json b/package-lock.json
index 54e60fad..6920115d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2335,6 +2335,11 @@
"d3-interpolate": "1"
}
},
+ "dat.gui": {
+ "version": "0.7.6",
+ "resolved": "https://registry.npmjs.org/dat.gui/-/dat.gui-0.7.6.tgz",
+ "integrity": "sha512-9Uqr4aQUvp9q5P2b4y6gK604HXafubOq578OmOS8mjrIkYrBP4EbQ9gz9YRXgyPh7aQi+b9H/jAG7EucmhYpSA=="
+ },
"data-uri-to-blob": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/data-uri-to-blob/-/data-uri-to-blob-0.0.4.tgz",
@@ -3864,7 +3869,8 @@
"ansi-regex": {
"version": "2.1.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"aproba": {
"version": "1.2.0",
@@ -3885,12 +3891,14 @@
"balanced-match": {
"version": "1.0.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"brace-expansion": {
"version": "1.1.11",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -3905,17 +3913,20 @@
"code-point-at": {
"version": "1.1.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"concat-map": {
"version": "0.0.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"console-control-strings": {
"version": "1.1.0",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"core-util-is": {
"version": "1.0.2",
@@ -4032,7 +4043,8 @@
"inherits": {
"version": "2.0.3",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"ini": {
"version": "1.3.5",
@@ -4044,6 +4056,7 @@
"version": "1.0.0",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"number-is-nan": "^1.0.0"
}
@@ -4058,6 +4071,7 @@
"version": "3.0.4",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"brace-expansion": "^1.1.7"
}
@@ -4065,12 +4079,14 @@
"minimist": {
"version": "0.0.8",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"minipass": {
"version": "2.2.4",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"safe-buffer": "^5.1.1",
"yallist": "^3.0.0"
@@ -4089,6 +4105,7 @@
"version": "0.5.1",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"minimist": "0.0.8"
}
@@ -4169,7 +4186,8 @@
"number-is-nan": {
"version": "1.0.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"object-assign": {
"version": "4.1.1",
@@ -4181,6 +4199,7 @@
"version": "1.4.0",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"wrappy": "1"
}
@@ -4266,7 +4285,8 @@
"safe-buffer": {
"version": "5.1.1",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"safer-buffer": {
"version": "2.1.2",
@@ -4302,6 +4322,7 @@
"version": "1.0.2",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0",
@@ -4321,6 +4342,7 @@
"version": "3.0.1",
"bundled": true,
"dev": true,
+ "optional": true,
"requires": {
"ansi-regex": "^2.0.0"
}
@@ -4364,12 +4386,14 @@
"wrappy": {
"version": "1.0.2",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
},
"yallist": {
"version": "3.0.2",
"bundled": true,
- "dev": true
+ "dev": true,
+ "optional": true
}
}
},
@@ -4450,6 +4474,7 @@
"resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
"integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
"dev": true,
+ "optional": true,
"requires": {
"is-glob": "^2.0.0"
}
@@ -5441,7 +5466,8 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
"integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
- "dev": true
+ "dev": true,
+ "optional": true
},
"is-finite": {
"version": "1.0.2",
@@ -5463,6 +5489,7 @@
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
"integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
"dev": true,
+ "optional": true,
"requires": {
"is-extglob": "^1.0.0"
}
diff --git a/package.json b/package.json
index bbd3d763..7f53f126 100644
--- a/package.json
+++ b/package.json
@@ -31,6 +31,7 @@
"csv-parse": "^4.2.0",
"csv-stringify": "^4.3.1",
"d3-scale-chromatic": "^1.3.3",
+ "dat.gui": "^0.7.6",
"data-uri-to-blob": "0.0.4",
"data-uri-to-buffer": "^2.0.0",
"date-fns": "^1.29.0",
diff --git a/site/assets/data/faces/brad_smith_1_0.drc b/site/assets/data/faces/brad_smith_1_0.drc
index 8266f10e..6e748068 100644
--- a/site/assets/data/faces/brad_smith_1_0.drc
+++ b/site/assets/data/faces/brad_smith_1_0.drc
Binary files differ
diff --git a/site/assets/data/faces/bush_1_0.drc b/site/assets/data/faces/bush_1_0.drc
index 95251f4f..b0cc1185 100644
--- a/site/assets/data/faces/bush_1_0.drc
+++ b/site/assets/data/faces/bush_1_0.drc
Binary files differ
diff --git a/site/assets/data/faces/george_tenet_1_0.drc b/site/assets/data/faces/george_tenet_1_0.drc
index e6ebdf03..d4140944 100644
--- a/site/assets/data/faces/george_tenet_1_0.drc
+++ b/site/assets/data/faces/george_tenet_1_0.drc
Binary files differ
diff --git a/site/assets/data/faces/john_ashcroft_1_0.drc b/site/assets/data/faces/john_ashcroft_1_0.drc
index 8cfe1f9e..bdf5fa45 100644
--- a/site/assets/data/faces/john_ashcroft_1_0.drc
+++ b/site/assets/data/faces/john_ashcroft_1_0.drc
Binary files differ
diff --git a/site/assets/data/faces/macron_1_0.drc b/site/assets/data/faces/macron_1_0.drc
index abe068f4..9a88cd0c 100644
--- a/site/assets/data/faces/macron_1_0.drc
+++ b/site/assets/data/faces/macron_1_0.drc
Binary files differ
diff --git a/site/assets/data/faces/macron_2_0.drc b/site/assets/data/faces/macron_2_0.drc
index b3af9d9d..a909cbb0 100644
--- a/site/assets/data/faces/macron_2_0.drc
+++ b/site/assets/data/faces/macron_2_0.drc
Binary files differ
diff --git a/site/assets/data/faces/macron_4_0.drc b/site/assets/data/faces/macron_4_0.drc
index 964822ff..aebf75c7 100644
--- a/site/assets/data/faces/macron_4_0.drc
+++ b/site/assets/data/faces/macron_4_0.drc
Binary files differ
diff --git a/site/assets/data/faces/putin_0.drc b/site/assets/data/faces/putin_0.drc
index 6d4ada4c..91633f5d 100644
--- a/site/assets/data/faces/putin_0.drc
+++ b/site/assets/data/faces/putin_0.drc
Binary files differ
diff --git a/site/assets/data/faces/putin_1_0.drc b/site/assets/data/faces/putin_1_0.drc
index e1acb6e2..41a9d6e0 100644
--- a/site/assets/data/faces/putin_1_0.drc
+++ b/site/assets/data/faces/putin_1_0.drc
Binary files differ
diff --git a/site/assets/data/faces/putin_2_0.drc b/site/assets/data/faces/putin_2_0.drc
index e539d799..93d2451f 100644
--- a/site/assets/data/faces/putin_2_0.drc
+++ b/site/assets/data/faces/putin_2_0.drc
Binary files differ
diff --git a/site/assets/data/faces/putin_3_0.drc b/site/assets/data/faces/putin_3_0.drc
index b4aa4382..aceb396f 100644
--- a/site/assets/data/faces/putin_3_0.drc
+++ b/site/assets/data/faces/putin_3_0.drc
Binary files differ
diff --git a/site/assets/data/faces/putin_4_0.drc b/site/assets/data/faces/putin_4_0.drc
index f93bdfdc..05e89892 100644
--- a/site/assets/data/faces/putin_4_0.drc
+++ b/site/assets/data/faces/putin_4_0.drc
Binary files differ
diff --git a/site/assets/data/faces/trudeau_1_0.drc b/site/assets/data/faces/trudeau_1_0.drc
index a76c4244..72d6f7d2 100644
--- a/site/assets/data/faces/trudeau_1_0.drc
+++ b/site/assets/data/faces/trudeau_1_0.drc
Binary files differ
diff --git a/site/assets/data/faces/trudeau_2_0.drc b/site/assets/data/faces/trudeau_2_0.drc
index 45fc9588..2936205e 100644
--- a/site/assets/data/faces/trudeau_2_0.drc
+++ b/site/assets/data/faces/trudeau_2_0.drc
Binary files differ
diff --git a/site/assets/data/faces/trudeau_3_0.drc b/site/assets/data/faces/trudeau_3_0.drc
index a4de31c7..37b3f316 100644
--- a/site/assets/data/faces/trudeau_3_0.drc
+++ b/site/assets/data/faces/trudeau_3_0.drc
Binary files differ
diff --git a/site/assets/data/faces/trudeau_4_0.drc b/site/assets/data/faces/trudeau_4_0.drc
index dbc74557..8d2929ce 100644
--- a/site/assets/data/faces/trudeau_4_0.drc
+++ b/site/assets/data/faces/trudeau_4_0.drc
Binary files differ
diff --git a/site/assets/data/faces/trudeau_5_0.drc b/site/assets/data/faces/trudeau_5_0.drc
index 958db58b..d3bcfe8f 100644
--- a/site/assets/data/faces/trudeau_5_0.drc
+++ b/site/assets/data/faces/trudeau_5_0.drc
Binary files differ
diff --git a/site/assets/data/faces/trump_1_0.drc b/site/assets/data/faces/trump_1_0.drc
index 2f78607b..98bd6395 100644
--- a/site/assets/data/faces/trump_1_0.drc
+++ b/site/assets/data/faces/trump_1_0.drc
Binary files differ
diff --git a/site/assets/data/faces/trump_2_0.drc b/site/assets/data/faces/trump_2_0.drc
index 129b6c61..8d29271e 100644
--- a/site/assets/data/faces/trump_2_0.drc
+++ b/site/assets/data/faces/trump_2_0.drc
Binary files differ
diff --git a/site/assets/data/faces/trump_3_0.drc b/site/assets/data/faces/trump_3_0.drc
index bd4956a4..0de2f4b9 100644
--- a/site/assets/data/faces/trump_3_0.drc
+++ b/site/assets/data/faces/trump_3_0.drc
Binary files differ
diff --git a/site/assets/data/faces/trump_3_1.drc b/site/assets/data/faces/trump_3_1.drc
index 79ddca44..dc2eb398 100644
--- a/site/assets/data/faces/trump_3_1.drc
+++ b/site/assets/data/faces/trump_3_1.drc
Binary files differ
diff --git a/site/assets/data/faces/trump_4_0.drc b/site/assets/data/faces/trump_4_0.drc
index dd4c8756..3bb744c1 100644
--- a/site/assets/data/faces/trump_4_0.drc
+++ b/site/assets/data/faces/trump_4_0.drc
Binary files differ
diff --git a/site/assets/data/faces/xi_1_0.drc b/site/assets/data/faces/xi_1_0.drc
index feb96781..6d145f91 100644
--- a/site/assets/data/faces/xi_1_0.drc
+++ b/site/assets/data/faces/xi_1_0.drc
Binary files differ
diff --git a/site/assets/data/faces/xi_2_0.drc b/site/assets/data/faces/xi_2_0.drc
index 38a30922..255de54b 100644
--- a/site/assets/data/faces/xi_2_0.drc
+++ b/site/assets/data/faces/xi_2_0.drc
Binary files differ