From 58c65c73f260c65f103d7f3fcedf7a3b2ebb99fe Mon Sep 17 00:00:00 2001
From: 0xFEEDC0DE64 <daniel@brunner.ninja>
Date: Wed, 22 Feb 2023 01:25:32 +0100
Subject: [PATCH] 3D view now shows lights and added double spinbox

---
 CMakeLists.txt           |   3 +-
 Devices3dView.qml        | 111 ++---------
 DevicesSettingsPage.qml  |   2 +
 DoubleSpinBox.qml        |  39 ++++
 Vector3DField.qml        |  32 ++-
 devicesmodel.cpp         |  22 ++-
 dmxcontroller.cpp        |  15 ++
 models/cube.obj          | 415 ---------------------------------------
 textures/cubetexture.png | Bin 10429 -> 0 bytes
 9 files changed, 113 insertions(+), 526 deletions(-)
 create mode 100644 DoubleSpinBox.qml
 delete mode 100644 models/cube.obj
 delete mode 100644 textures/cubetexture.png

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ecc5221..589a4b3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,8 +39,6 @@ qt_add_qml_module(appscheincommander
         icons/nebelmaschine.png
         icons/rgbstrahler.png
         ui-icons/MaterialIcons-Regular.ttf
-        models/cube.obj
-        textures/cubetexture.png
     QML_FILES
         main.qml
         HomePage.qml
@@ -63,6 +61,7 @@ qt_add_qml_module(appscheincommander
         AnimatedInputPanel.qml
         AnimatedStackView.qml
         Devices3dView.qml
+        DoubleSpinBox.qml
 )
 
 add_definitions(-DCMAKE_PROJECT_VERSION=${CMAKE_PROJECT_VERSION})
diff --git a/Devices3dView.qml b/Devices3dView.qml
index 6121aa3..4f846d5 100644
--- a/Devices3dView.qml
+++ b/Devices3dView.qml
@@ -3,63 +3,13 @@ import QtDataVisualization
 import QtQuick.Controls
 
 Item {
-
     property int selectedAxisLabel: -1
-    property real dragSpeedModifier: 100.0
+    property real dragSpeedModifier: 25.0
     property int currentMouseX: -1
     property int currentMouseY: -1
     property int previousMouseX: -1
     property int previousMouseY: -1
-
-    ListModel {
-        id: graphModel
-        ListElement{ xPos: 0.0; yPos: 0.0; zPos: 0.0; rotation: "@0,0,0,0" }
-        ListElement{ xPos: 1.0; yPos: 1.0; zPos: 1.0; rotation: "@45,1,1,1" }
-    }
-
-    Timer {
-        id: dataTimer
-        interval: 1
-        running: true
-        repeat: true
-        property bool isIncreasing: true
-        property real rotationAngle: 0
-
-        function generateQuaternion() {
-            return "@" + Math.random() * 360 + "," + Math.random() + ","
-                    + Math.random() + "," + Math.random()
-        }
-
-        function appendRow() {
-            graphModel.append({"xPos": Math.random(),
-                                  "yPos": Math.random(),
-                                  "zPos": Math.random(),
-                                  "rotation": generateQuaternion()
-                              });
-        }
-
-        //! [10]
-        onTriggered: {
-            rotationAngle = rotationAngle + 1
-            qtCube.setRotationAxisAndAngle(Qt.vector3d(1,0,1), rotationAngle)
-            //! [10]
-            scatterSeries.setMeshAxisAndAngle(Qt.vector3d(1,1,1), rotationAngle)
-            if (isIncreasing) {
-                for (var i = 0; i < 10; i++)
-                    appendRow()
-                if (graphModel.count > 2002) {
-                    scatterGraph.theme = isabelleTheme
-                    isIncreasing = false
-                }
-            } else {
-                graphModel.remove(2, 10);
-                if (graphModel.count == 2) {
-                    scatterGraph.theme = dynamicColorTheme
-                    isIncreasing = true
-                }
-            }
-        }
-    }
+    property alias model: itemModelScatterDataProxy.itemModel
 
     ThemeColor {
         id: dynamicColor
@@ -108,6 +58,12 @@ Item {
             scene.activeCamera.yRotation: 45.0
             scene.activeCamera.xRotation: 45.0
             scene.activeCamera.zoomLevel: 75.0
+            axisX.min: -10
+            axisX.max: 10
+            axisY.min: -10
+            axisY.max: 10
+            axisZ.min: -10
+            axisZ.max: 10
 
             Scatter3DSeries {
                 id: scatterSeries
@@ -115,25 +71,13 @@ Item {
                 mesh: Abstract3DSeries.MeshCube
 
                 ItemModelScatterDataProxy {
-                    itemModel: graphModel
-                    xPosRole: "xPos"
-                    yPosRole: "yPos"
-                    zPosRole: "zPos"
-                    rotationRole: "rotation"
+                    id: itemModelScatterDataProxy
+                    xPosRole: "positionX"
+                    yPosRole: "positionY"
+                    zPosRole: "positionZ"
+                    //rotationRole: "rotation"
                 }
             }
-            //! [9]
-            customItemList: [
-                Custom3DItem {
-                    id: qtCube
-                    meshFile: ":/scheincommander/models/cube.obj"
-                    textureFile: ":/scheincommander/textures/cubetexture.png"
-                    position: Qt.vector3d(0.65,0.35,0.65)
-                    scaling: Qt.vector3d(0.3,0.3,0.3)
-                }
-            ]
-            //! [9]
-            //! [5]
             onSelectedElementChanged: {
                 if (selectedElement >= AbstractGraph3D.ElementAxisXLabel
                         && selectedElement <= AbstractGraph3D.ElementAxisZLabel)
@@ -141,36 +85,27 @@ Item {
                 else
                     selectedAxisLabel = -1
             }
-            //! [5]
         }
 
-        //! [1]
         MouseArea {
             anchors.fill: parent
             hoverEnabled: true
             acceptedButtons: Qt.LeftButton
-            //! [1]
 
-            //! [3]
             onPositionChanged: (mouse)=> {
                 currentMouseX = mouse.x;
                 currentMouseY = mouse.y;
-                //! [3]
-                //! [6]
+
                 if (pressed && selectedAxisLabel != -1)
                     dragAxis();
-                //! [6]
-                //! [4]
+
                 previousMouseX = currentMouseX;
                 previousMouseY = currentMouseY;
             }
-            //! [4]
 
-            //! [2]
             onPressed: (mouse)=> {
                 scatterGraph.scene.selectionQueryPosition = Qt.point(mouse.x, mouse.y);
             }
-            //! [2]
 
             onReleased: {
                 // We need to clear mouse positions and selected axis, because touch devices cannot
@@ -184,7 +119,6 @@ Item {
         }
     }
 
-    //! [7]
     function dragAxis() {
         // Do nothing if previous mouse position is uninitialized
         if (previousMouseX === -1)
@@ -235,11 +169,10 @@ Item {
             break
         }
     }
-    //! [7]
 
     Button {
         id: rangeToggle
-        width: parent.width / 3 // We're adding 3 buttons and want to divide them equally
+        width: parent.width / 2 // We're adding 3 buttons and want to divide them equally
         text: "Use Preset Range"
         anchors.left: parent.left
         property bool autoRange: true
@@ -265,10 +198,9 @@ Item {
         }
     }
 
-    //! [8]
     Button {
         id: orthoToggle
-        width: parent.width / 3
+        width: parent.width / 2
         text: "Display Orthographic"
         anchors.left: rangeToggle.right
         onClicked: {
@@ -283,13 +215,4 @@ Item {
             }
         }
     }
-    //! [8]
-
-    Button {
-        id: exitButton
-        width: parent.width / 3
-        text: "Quit"
-        anchors.left: orthoToggle.right
-        onClicked: Qt.quit();
-    }
 }
diff --git a/DevicesSettingsPage.qml b/DevicesSettingsPage.qml
index b246d7a..c368a73 100644
--- a/DevicesSettingsPage.qml
+++ b/DevicesSettingsPage.qml
@@ -119,6 +119,8 @@ ColumnLayout {
         Devices3dView {
             Layout.fillWidth: true
             Layout.fillHeight: true
+
+            model: model
         }
     }
 }
diff --git a/DoubleSpinBox.qml b/DoubleSpinBox.qml
new file mode 100644
index 0000000..ff8e7e9
--- /dev/null
+++ b/DoubleSpinBox.qml
@@ -0,0 +1,39 @@
+import QtQuick
+import QtQuick.Controls
+
+SpinBox {
+    id: spinbox
+
+    property int decimals: 2
+    property real factor: 100
+
+    property real realFrom: from / factor
+    property real realTo: to / factor
+    property real realValue: value / factor
+
+    from: realFrom * factor
+    to: realTo * factor
+    value: realValue * factor
+
+    stepSize: factor
+
+    signal realValueModified
+
+    onValueModified: {
+        realValue = Qt.binding(function(){ return value / factor; });
+        realValueModified();
+    }
+
+    validator: DoubleValidator {
+        bottom: Math.min(spinbox.from, spinbox.to)
+        top:  Math.max(spinbox.from, spinbox.to)
+    }
+
+    textFromValue: function(value, locale) {
+        return Number(value / 100).toLocaleString(locale, 'f', spinbox.decimals)
+    }
+
+    valueFromText: function(text, locale) {
+        return Number.fromLocaleString(locale, text) * 100
+    }
+}
diff --git a/Vector3DField.qml b/Vector3DField.qml
index d467b1d..5c27c84 100644
--- a/Vector3DField.qml
+++ b/Vector3DField.qml
@@ -7,15 +7,15 @@ GridLayout {
 
     property vector3d value
     onValueChanged: {
-        xBox.value = value.x
-        yBox.value = value.y
-        zBox.value = value.z
+        xBox.realValue = value.x
+        yBox.realValue = value.y
+        zBox.realValue = value.z
     }
 
     signal valueModified
 
     function updateValue() {
-        const newValue = Qt.vector3d(xBox.value, yBox.value, zBox.value);
+        const newValue = Qt.vector3d(xBox.realValue, yBox.realValue, zBox.realValue);
         console.log(newValue);
         if (newValue === value)
             return;
@@ -27,26 +27,38 @@ GridLayout {
         text: qsTr('x:')
     }
 
-    SpinBox {
+    DoubleSpinBox {
         id: xBox
-        onValueModified: updateValue()
+        editable: true
+        realFrom: -1000
+        realTo: 1000
+        //stepSize: 0.01
+        onRealValueModified: updateValue()
     }
 
     Label {
         text: qsTr('y:')
     }
 
-    SpinBox {
+    DoubleSpinBox {
         id: yBox
-        onValueModified: updateValue()
+        editable: true
+        realFrom: -1000
+        realTo: 1000
+        //stepSize: 0.01
+        onRealValueModified: updateValue()
     }
 
     Label {
         text: qsTr('z:')
     }
 
-    SpinBox {
+    DoubleSpinBox {
         id: zBox
-        onValueModified: updateValue()
+        editable: true
+        realFrom: -1000
+        realTo: 1000
+        //stepSize: 0.01
+        onRealValueModified: updateValue()
     }
 }
diff --git a/devicesmodel.cpp b/devicesmodel.cpp
index 4ea240d..5898d2a 100644
--- a/devicesmodel.cpp
+++ b/devicesmodel.cpp
@@ -11,7 +11,10 @@ enum {
     IdRole = Qt::UserRole,
     DeviceTypeIdRole,
     AddressRole,
-    PositionRole
+    PositionRole,
+    PositionXRole,
+    PositionYRole,
+    PositionZRole
 };
 
 void DevicesModel::setController(DmxController *controller)
@@ -111,6 +114,9 @@ QVariant DevicesModel::data(const QModelIndex &index, int role) const
     case DeviceTypeIdRole: return device.deviceTypeId;
     case AddressRole:     return device.address;
     case PositionRole:    return device.position;
+    case PositionXRole:   return device.position.x();
+    case PositionYRole:   return device.position.y();
+    case PositionZRole:   return device.position.z();
     }
 
     return {};
@@ -149,7 +155,10 @@ QMap<int, QVariant> DevicesModel::itemData(const QModelIndex &index) const
         { IdRole,          device.id },
         { DeviceTypeIdRole, device.deviceTypeId },
         { AddressRole,     device.address },
-        { PositionRole,    device.position }
+        { PositionRole,    device.position },
+        { PositionXRole,   device.position.x() },
+        { PositionYRole,   device.position.y() },
+        { PositionZRole,   device.position.z() }
     };
 }
 
@@ -160,7 +169,10 @@ QHash<int, QByteArray> DevicesModel::roleNames() const
         { IdRole,          "id" },
         { DeviceTypeIdRole, "deviceTypeId" },
         { AddressRole,     "address" },
-        { PositionRole,    "position" }
+        { PositionRole,    "position" },
+        { PositionXRole,   "positionX" },
+        { PositionYRole,   "positionY" },
+        { PositionZRole,   "positionZ" }
     };
 }
 
@@ -273,7 +285,7 @@ bool DevicesModel::setData(const QModelIndex &index, const QVariant &value, int
             QMutexLocker locker{&m_controller->mutex()};
             device.position = value.value<QVector3D>();
         }
-        emit dataChanged(index, index, { PositionRole });
+        emit dataChanged(index, index, { PositionRole, PositionXRole, PositionYRole, PositionZRole });
 
         disconnect(m_controller, &DmxController::devicePositionChanged,
                    this, &DevicesModel::otherDevicePositionChanged);
@@ -458,7 +470,7 @@ void DevicesModel::otherDevicePositionChanged(int row, const QVector3D &position
     }
 
     const auto index = this->index(row);
-    emit dataChanged(index, index, { PositionRole });
+    emit dataChanged(index, index, { PositionRole, PositionXRole, PositionYRole, PositionZRole });
 }
 
 namespace {
diff --git a/dmxcontroller.cpp b/dmxcontroller.cpp
index 742b547..673bca2 100644
--- a/dmxcontroller.cpp
+++ b/dmxcontroller.cpp
@@ -9,6 +9,18 @@
 
 #include "projectloader.h"
 
+void doFun(auto &y)
+{
+    return;
+    double i{-10};
+    for (auto &x : y.devices)
+    {
+        x.position.setX(i);
+        x.position.setZ(std::sin(i / 2.) * 10.);
+        i += 20./double(y.devices.size());
+    }
+}
+
 DmxController::DmxController(ScheinCommanderSettings &settings, QObject *parent) :
     QObject{parent},
     m_settings{settings},
@@ -168,6 +180,7 @@ DmxController::DmxController(ScheinCommanderSettings &settings, QObject *parent)
         }
     }
 {
+    doFun(m_lightProject);
 }
 
 bool DmxController::start()
@@ -243,6 +256,8 @@ bool DmxController::loadProject(const QString &name)
         return false;
     }
 
+    doFun(m_lightProject);
+
     return true;
 }
 
diff --git a/models/cube.obj b/models/cube.obj
deleted file mode 100644
index 0197618..0000000
--- a/models/cube.obj
+++ /dev/null
@@ -1,415 +0,0 @@
-# Blender v2.66 (sub 0) OBJ File: 'beveled_cube.blend'
-# www.blender.org
-v -1.000000 -0.878027 0.878027
-v -0.978771 -0.929277 0.878027
-v -0.950975 -0.932562 0.932562
-v -0.978771 -0.878027 0.929277
-v -0.932562 -0.950975 0.932562
-v -0.929277 -0.978771 0.878027
-v -0.878027 -1.000000 0.878027
-v -0.878027 -0.978771 0.929277
-v -0.932562 -0.932562 0.950975
-v -0.878027 -0.929277 0.978771
-v -0.878027 -0.878027 1.000000
-v -0.929277 -0.878027 0.978771
-v -1.000000 -0.878027 -0.878027
-v -0.978771 -0.878027 -0.929277
-v -0.950975 -0.932562 -0.932562
-v -0.978771 -0.929277 -0.878027
-v -0.932562 -0.932562 -0.950975
-v -0.929277 -0.878027 -0.978771
-v -0.878027 -0.878027 -1.000000
-v -0.878027 -0.929277 -0.978771
-v -0.932562 -0.950975 -0.932562
-v -0.878027 -0.978771 -0.929277
-v -0.878027 -1.000000 -0.878027
-v -0.929277 -0.978771 -0.878027
-v 0.878027 -0.878027 -1.000000
-v 0.929277 -0.878027 -0.978771
-v 0.932562 -0.932562 -0.950975
-v 0.878027 -0.929277 -0.978771
-v 0.950975 -0.932562 -0.932562
-v 0.978771 -0.878027 -0.929277
-v 1.000000 -0.878027 -0.878027
-v 0.978771 -0.929277 -0.878027
-v 0.932562 -0.950975 -0.932562
-v 0.929277 -0.978771 -0.878027
-v 0.878027 -1.000000 -0.878027
-v 0.878027 -0.978771 -0.929277
-v 1.000000 -0.878027 0.878027
-v 0.978771 -0.878027 0.929277
-v 0.950975 -0.932562 0.932562
-v 0.978771 -0.929277 0.878027
-v 0.932562 -0.932562 0.950975
-v 0.929277 -0.878027 0.978771
-v 0.878027 -0.878027 1.000000
-v 0.878027 -0.929277 0.978771
-v 0.932562 -0.950975 0.932562
-v 0.878027 -0.978771 0.929277
-v 0.878027 -1.000000 0.878027
-v 0.929277 -0.978771 0.878027
-v -0.878027 0.878027 1.000000
-v -0.878027 0.929277 0.978771
-v -0.932562 0.932562 0.950975
-v -0.929277 0.878027 0.978771
-v -0.932562 0.950975 0.932562
-v -0.878027 0.978771 0.929277
-v -0.878027 1.000000 0.878027
-v -0.929277 0.978771 0.878027
-v -0.950975 0.932562 0.932562
-v -0.978771 0.929277 0.878027
-v -1.000000 0.878027 0.878027
-v -0.978771 0.878027 0.929277
-v -1.000000 0.878027 -0.878027
-v -0.978771 0.929277 -0.878027
-v -0.950975 0.932562 -0.932562
-v -0.978771 0.878027 -0.929277
-v -0.932562 0.950975 -0.932562
-v -0.929277 0.978771 -0.878027
-v -0.878027 1.000000 -0.878027
-v -0.878027 0.978771 -0.929277
-v -0.932562 0.932562 -0.950975
-v -0.878027 0.929277 -0.978771
-v -0.878027 0.878027 -1.000000
-v -0.929277 0.878027 -0.978771
-v 0.878027 0.878027 -1.000000
-v 0.878027 0.929277 -0.978771
-v 0.932562 0.932562 -0.950975
-v 0.929277 0.878027 -0.978771
-v 0.932562 0.950975 -0.932562
-v 0.878027 0.978771 -0.929277
-v 0.878027 1.000000 -0.878027
-v 0.929277 0.978771 -0.878027
-v 0.950975 0.932562 -0.932562
-v 0.978771 0.929277 -0.878027
-v 1.000000 0.878027 -0.878027
-v 0.978771 0.878027 -0.929277
-v 1.000000 0.878027 0.878027
-v 0.978771 0.929277 0.878027
-v 0.950975 0.932562 0.932562
-v 0.978771 0.878027 0.929277
-v 0.932562 0.950975 0.932562
-v 0.929277 0.978771 0.878027
-v 0.878027 1.000000 0.878027
-v 0.878027 0.978771 0.929277
-v 0.932562 0.932562 0.950975
-v 0.878027 0.929277 0.978771
-v 0.878027 0.878027 1.000000
-v 0.929277 0.878027 0.978771
-vt 0.024513 0.966281
-vt 0.033719 0.975487
-vt 0.033719 0.966281
-vt 0.964639 0.060986
-vt 0.964639 0.939014
-vt 0.989386 0.939014
-vt 0.939014 0.964639
-vt 0.060986 0.964639
-vt 0.939014 0.989386
-vt 0.060986 0.060986
-vt 0.060986 0.939014
-vt 0.939014 0.939014
-vt 0.035361 0.060986
-vt 0.035361 0.939014
-vt 0.010614 0.060986
-vt 0.010614 0.939014
-vt 0.989386 0.060986
-vt 0.939014 0.035361
-vt 0.060986 0.035361
-vt 0.060986 0.010614
-vt 0.060986 0.989386
-vt 0.939014 0.060986
-vt 0.966281 0.975487
-vt 0.966281 0.966281
-vt 0.975487 0.966281
-vt 0.975487 0.033719
-vt 0.966281 0.033719
-vt 0.966281 0.024513
-vt 0.033719 0.024513
-vt 0.033719 0.033719
-vt 0.024513 0.033719
-vt 0.939014 0.010614
-vn -0.713187 -0.495651 -0.495651
-vn -0.495651 -0.495651 -0.713187
-vn -0.495651 -0.713187 -0.495651
-vn 0.539384 -0.823450 0.175909
-vn 0.539384 -0.823450 -0.175909
-vn 0.823450 -0.539384 -0.175909
-vn -0.713187 0.495651 -0.495651
-vn -0.495651 0.713187 -0.495651
-vn -0.495651 0.495651 -0.713187
-vn 0.175909 -0.823450 -0.539384
-vn -0.185644 -0.825892 -0.532365
-vn 0.175909 -0.539384 -0.823450
-vn -0.193426 -0.961852 0.193426
-vn -0.193426 -0.961852 -0.193426
-vn 0.187689 -0.964110 -0.187689
-vn -0.532365 -0.185644 0.825892
-vn -0.532365 0.185644 0.825892
-vn -0.825892 -0.185644 0.532365
-vn -0.532365 0.185644 -0.825892
-vn -0.532365 -0.185644 -0.825892
-vn -0.825892 0.185644 -0.532365
-vn 0.823450 0.175909 -0.539384
-vn 0.823450 -0.175909 -0.539384
-vn 0.539384 -0.175909 -0.823450
-vn 0.539384 0.175909 0.823450
-vn 0.539384 -0.175909 0.823450
-vn 0.823450 -0.175909 0.539384
-vn 0.175909 0.823450 0.539384
-vn -0.185644 0.825892 0.532365
-vn -0.185644 0.532365 0.825892
-vn -0.185644 0.825892 -0.532365
-vn 0.175909 0.823450 -0.539384
-vn -0.185644 0.532365 -0.825892
-vn 0.539384 0.823450 -0.175909
-vn 0.539384 0.823450 0.175909
-vn 0.823450 0.539384 0.175909
-vn 0.187689 0.964110 0.187689
-vn 0.187689 0.964110 -0.187689
-vn -0.193426 0.961852 -0.193426
-vn -0.193426 0.193426 -0.961852
-vn 0.187689 0.187689 -0.964110
-vn -0.193426 -0.193426 -0.961852
-vn -0.961852 0.193426 0.193426
-vn -0.961852 0.193426 -0.193426
-vn -0.961852 -0.193426 0.193426
-vn -0.532365 -0.825892 -0.185644
-vn -0.532365 -0.825892 0.185644
-vn -0.825892 -0.532365 -0.185644
-vn 0.498856 0.498856 -0.708701
-vn 0.498856 0.708701 -0.498856
-vn 0.708701 0.498856 -0.498856
-vn 0.964110 0.187689 -0.187689
-vn 0.964110 0.187689 0.187689
-vn 0.964110 -0.187689 0.187689
-vn 0.498856 -0.498856 -0.708701
-vn 0.708701 -0.498856 -0.498856
-vn 0.498856 -0.708701 -0.498856
-vn 0.708701 0.498856 0.498856
-vn 0.498856 0.708701 0.498856
-vn 0.498856 0.498856 0.708701
-vn -0.495651 0.495651 0.713187
-vn -0.495651 0.713187 0.495651
-vn -0.713187 0.495651 0.495651
-vn 0.708701 -0.498856 0.498856
-vn 0.498856 -0.498856 0.708701
-vn 0.498856 -0.708701 0.498856
-vn -0.532365 0.825892 0.185644
-vn -0.532365 0.825892 -0.185644
-vn -0.825892 0.532365 0.185644
-vn 0.187689 0.187689 0.964110
-vn -0.193426 0.193426 0.961852
-vn -0.193426 -0.193426 0.961852
-vn -0.185644 -0.825892 0.532365
-vn 0.175909 -0.823450 0.539384
-vn 0.175909 -0.539384 0.823450
-vn -0.825892 -0.532365 0.185644
-vn -0.713187 -0.495651 0.495651
-vn -0.495651 -0.713187 0.495651
-vn -0.495651 -0.495651 0.713187
-vn -0.185644 -0.532365 0.825892
-vn -0.961852 -0.193426 -0.193426
-vn -0.825892 -0.185644 -0.532365
-vn 0.187689 -0.187689 -0.964110
-vn 0.823450 -0.539384 0.175909
-vn -0.193426 0.961852 0.193426
-vn -0.825892 0.532365 -0.185644
-vn 0.175909 0.539384 -0.823450
-vn 0.539384 0.175909 -0.823450
-vn 0.823450 0.539384 -0.175909
-vn 0.823450 0.175909 0.539384
-vn 0.175909 0.539384 0.823450
-vn -0.185644 -0.532365 -0.825892
-vn -0.825892 0.185644 0.532365
-vn 0.964110 -0.187689 -0.187689
-vn 0.187689 -0.187689 0.964110
-vn 0.187689 -0.964110 0.187689
-s 1
-f 15/1/1 17/2/2 21/3/3
-f 48/4/4 34/5/5 32/6/6
-f 63/1/7 65/3/8 69/2/9
-f 36/7/10 22/8/11 28/9/12
-f 7/10/13 23/11/14 35/12/15
-f 12/13/16 52/14/17 4/15/18
-f 72/14/19 18/13/20 64/16/21
-f 84/6/22 30/17/23 26/4/24
-f 96/5/25 42/4/26 38/17/27
-f 92/18/28 54/19/29 50/20/30
-f 68/8/31 78/7/32 70/21/33
-f 80/5/34 90/4/35 86/17/36
-f 91/22/37 79/12/38 67/11/39
-f 71/11/40 73/12/41 19/10/42
-f 59/11/43 61/12/44 1/10/45
-f 24/14/46 6/13/47 16/16/48
-f 75/23/49 77/24/50 81/25/51
-f 83/12/52 85/11/53 37/10/54
-f 27/23/55 29/25/56 33/24/57
-f 87/26/58 89/27/59 93/28/60
-f 51/29/61 53/30/62 57/31/63
-f 39/26/64 41/28/65 45/27/66
-f 56/13/67 66/14/68 58/15/69
-f 95/12/70 49/11/71 11/10/72
-f 8/19/73 46/18/74 44/32/75
-f 1/10/45 2/19/76 3/30/77
-f 5/30/78 6/13/47 7/10/13
-f 9/30/79 10/19/80 11/10/72
-f 13/22/81 14/4/82 15/27/1
-f 17/30/2 18/13/20 19/10/42
-f 21/3/3 22/8/11 23/11/14
-f 25/22/83 26/4/24 28/18/12
-f 29/27/56 30/4/23 32/18/6
-f 33/24/57 34/5/5 36/7/10
-f 37/10/54 38/13/27 40/19/84
-f 41/27/65 42/4/26 44/18/75
-f 45/27/66 46/18/74 48/4/4
-f 49/11/71 50/8/30 51/3/61
-f 53/30/62 54/19/29 55/10/85
-f 57/3/63 58/8/69 59/11/43
-f 61/12/44 62/7/86 63/24/7
-f 65/3/8 66/14/68 67/11/39
-f 69/3/9 70/8/33 71/11/40
-f 73/12/41 74/7/87 76/5/88
-f 77/24/50 78/7/32 80/5/34
-f 81/24/51 82/7/89 84/5/22
-f 85/11/53 86/8/36 88/14/90
-f 89/27/59 90/4/35 92/18/28
-f 93/24/60 94/7/91 96/5/25
-f 2/15/76 6/13/47 3/31/77
-f 8/19/73 10/20/80 5/30/78
-f 12/13/16 4/15/18 9/30/79
-f 14/15/82 18/13/20 15/31/1
-f 20/21/92 22/8/11 17/2/2
-f 24/14/46 16/16/48 21/3/3
-f 26/4/24 30/17/23 29/26/56
-f 32/6/6 34/5/5 33/24/57
-f 36/7/10 28/9/12 27/23/55
-f 38/17/27 42/4/26 41/27/65
-f 44/32/75 46/18/74 45/27/66
-f 48/4/4 40/17/84 39/26/64
-f 50/20/30 54/19/29 51/29/61
-f 56/13/67 58/15/69 53/30/62
-f 60/16/93 52/14/17 57/1/63
-f 62/16/86 66/14/68 63/1/7
-f 68/8/31 70/21/33 65/3/8
-f 72/14/19 64/16/21 69/3/9
-f 74/9/87 78/7/32 77/24/50
-f 80/5/34 82/6/89 81/25/51
-f 84/6/22 76/5/88 75/24/49
-f 86/17/36 90/4/35 89/27/59
-f 92/18/28 94/32/91 93/28/60
-f 96/5/25 88/6/90 87/25/58
-f 55/10/85 67/11/39 56/13/67
-f 61/12/44 59/11/43 62/7/86
-f 71/11/40 19/10/42 72/14/19
-f 13/22/81 61/12/44 14/4/82
-f 23/11/14 7/10/13 24/14/46
-f 1/10/45 13/22/81 2/19/76
-f 11/10/72 49/11/71 12/13/16
-f 59/11/43 1/10/45 60/14/93
-f 67/11/39 79/12/38 68/8/31
-f 73/12/41 71/11/40 74/7/87
-f 83/12/52 31/22/94 30/4/23
-f 25/22/83 73/12/41 76/5/88
-f 35/12/15 23/11/14 36/7/10
-f 19/10/42 25/22/83 20/19/92
-f 79/12/38 91/22/37 90/4/35
-f 85/11/53 83/12/52 82/7/89
-f 95/12/70 43/22/95 42/4/26
-f 37/10/54 85/11/53 88/14/90
-f 47/22/96 35/12/15 34/5/5
-f 31/22/94 37/10/54 40/19/84
-f 91/22/37 55/10/85 54/19/29
-f 49/11/71 95/12/70 94/7/91
-f 7/10/13 47/22/96 46/18/74
-f 43/22/95 11/10/72 10/19/80
-f 3/31/77 5/30/78 9/29/79
-f 40/17/84 48/4/4 32/6/6
-f 22/8/11 20/21/92 28/9/12
-f 47/22/96 7/10/13 35/12/15
-f 52/14/17 60/16/93 4/15/18
-f 18/13/20 14/15/82 64/16/21
-f 76/5/88 84/6/22 26/4/24
-f 88/6/90 96/5/25 38/17/27
-f 94/32/91 92/18/28 50/20/30
-f 78/7/32 74/9/87 70/21/33
-f 82/6/89 80/5/34 86/17/36
-f 55/10/85 91/22/37 67/11/39
-f 73/12/41 25/22/83 19/10/42
-f 61/12/44 13/22/81 1/10/45
-f 6/13/47 2/15/76 16/16/48
-f 31/22/94 83/12/52 37/10/54
-f 66/14/68 62/16/86 58/15/69
-f 43/22/95 95/12/70 11/10/72
-f 10/20/80 8/19/73 44/32/75
-f 4/13/18 1/10/45 3/30/77
-f 8/19/73 5/30/78 7/10/13
-f 12/13/16 9/30/79 11/10/72
-f 16/18/48 13/22/81 15/27/1
-f 20/19/92 17/30/2 19/10/42
-f 24/14/46 21/3/3 23/11/14
-f 26/4/24 27/27/55 28/18/12
-f 30/4/23 31/22/94 32/18/6
-f 34/5/5 35/12/15 36/7/10
-f 38/13/27 39/30/64 40/19/84
-f 42/4/26 43/22/95 44/18/75
-f 46/18/74 47/22/96 48/4/4
-f 52/14/17 49/11/71 51/3/61
-f 56/13/67 53/30/62 55/10/85
-f 60/14/93 57/3/63 59/11/43
-f 64/5/21 61/12/44 63/24/7
-f 68/8/31 65/3/8 67/11/39
-f 72/14/19 69/3/9 71/11/40
-f 74/7/87 75/24/49 76/5/88
-f 78/7/32 79/12/38 80/5/34
-f 82/7/89 83/12/52 84/5/22
-f 86/8/36 87/3/58 88/14/90
-f 90/4/35 91/22/37 92/18/28
-f 94/7/91 95/12/70 96/5/25
-f 6/13/47 5/30/78 3/31/77
-f 10/20/80 9/29/79 5/30/78
-f 4/15/18 3/31/77 9/30/79
-f 18/13/20 17/30/2 15/31/1
-f 22/8/11 21/3/3 17/2/2
-f 16/16/48 15/1/1 21/3/3
-f 27/27/55 26/4/24 29/26/56
-f 29/25/56 32/6/6 33/24/57
-f 33/24/57 36/7/10 27/23/55
-f 39/26/64 38/17/27 41/27/65
-f 41/28/65 44/32/75 45/27/66
-f 45/27/66 48/4/4 39/26/64
-f 54/19/29 53/30/62 51/29/61
-f 58/15/69 57/31/63 53/30/62
-f 52/14/17 51/3/61 57/1/63
-f 66/14/68 65/3/8 63/1/7
-f 70/21/33 69/2/9 65/3/8
-f 64/16/21 63/1/7 69/3/9
-f 75/23/49 74/9/87 77/24/50
-f 77/24/50 80/5/34 81/25/51
-f 81/25/51 84/6/22 75/24/49
-f 87/26/58 86/17/36 89/27/59
-f 89/27/59 92/18/28 93/28/60
-f 93/24/60 96/5/25 87/25/58
-f 67/11/39 66/14/68 56/13/67
-f 59/11/43 58/8/69 62/7/86
-f 19/10/42 18/13/20 72/14/19
-f 61/12/44 64/5/21 14/4/82
-f 7/10/13 6/13/47 24/14/46
-f 13/22/81 16/18/48 2/19/76
-f 49/11/71 52/14/17 12/13/16
-f 1/10/45 4/13/18 60/14/93
-f 79/12/38 78/7/32 68/8/31
-f 71/11/40 70/8/33 74/7/87
-f 84/5/22 83/12/52 30/4/23
-f 26/4/24 25/22/83 76/5/88
-f 23/11/14 22/8/11 36/7/10
-f 25/22/83 28/18/12 20/19/92
-f 80/5/34 79/12/38 90/4/35
-f 86/8/36 85/11/53 82/7/89
-f 96/5/25 95/12/70 42/4/26
-f 38/13/27 37/10/54 88/14/90
-f 48/4/4 47/22/96 34/5/5
-f 32/18/6 31/22/94 40/19/84
-f 92/18/28 91/22/37 54/19/29
-f 50/8/30 49/11/71 94/7/91
-f 8/19/73 7/10/13 46/18/74
-f 44/18/75 43/22/95 10/19/80
diff --git a/textures/cubetexture.png b/textures/cubetexture.png
deleted file mode 100644
index 3cea6863c53024bd4a9c7df24df35ada8c47e33a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10429
zcmeAS@N?(olHy`uVBq!ia0y~yU}OMc4mJh`hM1xiX$%YuEa{HEjtmSN`?>!lvNA9*
za29w(7BevL9RguSQ4OyK1_lPH64!{5;QX|b^2DN4hJeJ(yb?V>*ARs=V?9$nLj!{^
zMGF}iG%P(`978JN-p*yO2zC8-AY9<|tEjN@((?c7-mMaGbZ~enz_Kxc@%F9htWN7M
zO_ZyedT(j@ga&~s-^JhkG8VSVIdQyvZm%xndvEsdcXxIg>%ZSue((F)=Xx_|RzE*u
zxxaeZ+@H)B`c)i+I3hUzC?-Vv@v3u9U}<1*@Ny91NZ=G;VA}C{<x3StCWe;`o(c`B
z4h$R*&MjXynT3O43A0Kg!!!m)g$C>Sv;2e<7$)#dU}1`2VrgJ_SCeJs*}&jnH9&?)
zyf`5LYOl<v<I7szr@sj=diUJ;)cUM_dro~j_j>i*7n1+dWW3EIy%JuEd51?@9lgXh
z?bt-Gi7aze8XK4xj9;D9aor?x`jYRocN?ah5=vQK!^?HZ`)=1^^~<LnkC!?g=!r60
zx@pt&>YPgBuD|7*CQoU)XIh~0;5tKsn{CI^$vR7)n-tyqf9^cb{Mxq*Z|aAp@WyS4
zxn;|rB;9;?%Yi`Ctd;s+2lN>a@YJY!OQyNa|NC9Mu0m8wf2~f|fnA?c4HQ(2EZ!t$
zZqwJ|-aGlf=YjPM2Y9ONyk{<Ii(ioFxWe=$Z$jJh(<?%+&OWqY!~DI^nf?bmW(CH1
z9mr=m(DQHBiigSj)T6{2+q|__8eQ14iv3_g%hIDfe2SGTJ-+0mdmZ@5kZ{cAOxN!I
zWB+}2FZ%Fz)vC(WE%z$&jG7M_POD4ITwokJ`Q9yQp#l?z8HV~>K3)BP^+$YTS@xe>
zKWrJ<Y}+KJ9h!06;EXhv+xZW<oEBmXXJ*uI%lgy5U4v<DINO?!vl}1sFdvSZ=JsRT
zsY|z4PH9kPJit>wC-m`g&iz&0GWO5DAN!#A-1tJW#qmpO(~hkQu~~K6T;)Ls1IPI<
z>CKCd-MGFt*XG|Jn>$Zhtd$N&&Uzue$|qk@nejMdgXEXo)$#wITZuL2&0hU;v*RzX
z+d(()95Q8VeXH|VW$}cNW4nb4L>Oi~%-@*xXUEp<_mYbK=H_IEF-|Y}_NQW6nUTW<
zHTCzmb{t=B$;+_+?M-o3$BPq$v_xjSnqV*d(6daEhpW6`vaok??Fl`mXQ4983~3*Z
zyY$*w$M5^4zxk|P<-ViSA1Jc(&uOq}nLQ_Bk+0vZ2~SiQBL4l_f8lAUk)7q^&#5~f
zvZ&-0ait#a{5R{3Qo^cI7KR(*wufF_m;ZcyUevkiqBHOL>dq11*>N(H)!UirSW~Xq
z6-@>M+jFnEI)2~Wwg2qrKPd~ccum$n=}fRVx~J9j&3^k^Tg3NkzY}4IDElA(#_L_Z
z-1$GxrylIK6Mt-UWK+w;Ic~q_rgEE|c+PlW-<yX<@9MuAZu!{Gpip{7+O~~b$902=
z<Apw%*=IQ!HthMx-uUr8tElUKmMQ1$V`}gI?T|YxI&IO7f<yUcmX?eR)3*P;cYNA^
zt2J9i&--sT3jF(zS(fE6@3gXwCU-N}H3%~#RQ~y2F!@kQ!oTDMzqj6Z{?0hCr&V(w
z59@q3hT^B}r+WU+&yBva(#!e%+xiDl-V76_Fc|-fG-CK6zLr72qlR6Dg~9W;`*nLC
zHip*fi~s7Q7$-zAUSRZNYT#waQDOMeqx9OK&tb)6h6H8?YYqk$hW2V>76v8;$&H75
zZ}cs9Vo+cZVBlcb6t-adob~$5mjn)!r)_>)!^*r<r;=e4Px9k>CI-d>FF$~kWpFq+
zGel}%i0*4+_|jVXOZ?jP`}1uWBHJzsG}y4)e~<y0Z<JzhkP_+N%-{evI%TaxzU3_D
z1(pmq^`)l@UzYvEkRs_;%<#nWN8@vlk_ht@F%PC&YdM=9%-22$DiwUoc4j_(xOCy0
z2|)pg8ImiEU*=|PeX-x5Bv^dL-fE3C7Dj?$a<h3JrayQ3^3zp7&YJz&+*uq8kFy`_
z`TI8E%DMLo>aYC%a#iei*6Jz3j13G5Yz^OZdTy#;KIPb1r}}WE*?Nb@2ThR|C%ju7
zFThp0j!`%5Tf<T7Ll3@OjqvdE-KKKw%o(2@v&*FQ?)Ej_Elk|-=7)g9-pzVnxYn-=
zy17!X{D1(1PG(l$nMMPa7yEwt{wOMA)wr_QLL{MF@`=sgA0^#Jk#756f2s5E_Ma@e
zIB{psnUWpTO86F?JKuh?dbXj&6$R$7_lg1xDW=!wGd8rv&#ry@(ffVXlb<)Qr6#^O
z<yoNoaoL&|I@3>|In!{ub9sX684f9}6|D@62R51A(|)j?Va4_pLVwoQ2AUtPSJ=U^
zW%hOPJhfw|yL>!%9=S4m!@n;nY)w&51aGu6GCG85|K(+{&soFvw0&ArO^(m|Usv_7
zeVwZlet&x1_DSmxoOl0y(WcRsLx3S=>aF<<7p&H3{n^|6JN&<$*~#y3kC+ww&Reu*
z#+K>Ug|*T=_y4h0G8ZW*Fr3I*v7ceV!%1ErmOpE~yYJV}SK>_*E(kUlf7$oX+iNdt
zG5_BOq8uf0@+|RZ^xjX~H!E0h+1qUH$7QAsj?u3j?w=^1Yf$LPFd;Orp1~ou%=PAB
zU#^{!_5avf6RzA^xoOeK$wfP|Haz?y@<McB`PK)QC7<q`e(=w3=d1T`&E=fg5U^{S
z2>0^*ca49iUw1mPbEklqvCuR5cYKq-nY1cK+kfQR;A5sO$dI!2>Pv<LzBctwB<#;I
z^2D1)hUrws=n0p_@U-3&%+EAlx2f5?knzLaBky&${`L72m-{{=v0aJrK+yW1C+!--
z5<_?7+57$5nr{5pui&@s*W2s7Pb;b{S|-N)JKFmDPN6BckMwTVT`9zPASR|n!Xq!~
z_~J*8bL{hH@=x7yZ9~<BNz;<<8S|ak`1McHQ*D+V(w9n|L$2j{Oyiqpo#d&-!cbf&
z$Y8>-;LL&RJM`Xseyimi^GEb^T%iY_O#6B}%dnN=AKvcain(cfchQ#A^_>g}>pWN(
zjxzkn@?+gr{y)`Rb>Du+#E7l+i!1vrblj`lw9Z&uh?8Vl)u(Zo^+3BlTl6#@#se`a
zEDWs-FOE!GFP9zIvibmT-K&gy(tKwpPN)%W%ljR|$rAVClU8_Lb6C%I9a*M^ohLXL
zxELFD|EUO{X?uB<PR!2It9#5vo}Wng{oAlI`OwD?S9P~NXST{;!NzY|7H{M_(@pk%
zVx$!dL-9mG1`);uH}yjw{Hs1*9;;|j_15I`ynrdp+u!%ywqd&`^+|Wn6-ADJ>wPOL
zw%)D|NKa9gI5tf#dHvk*FDl=&#AILQp61TjutP|ELBCnu)lVPOYpj_XD#L|A#zuH>
zuKOhRDuj7b(4;ffhtm3%Y+>2Pna1*^vqt?i$HxN~?XAU&tCzP+?PKCyUUtn$va*|(
z^_P3C0&nB2$8pb38Dt!o9&|~OVMcc^!vY3|-sxd&HN1EDe=JZpC_T;eIc~$u$6k+K
zuIaE}H#_*liI1}vpDs{Wou3`esib-*YjgNrA!~0bhSqAa=S&M;FH%hFfBJ7OLxP?e
zQv(x&$ouF?t9Sg*iVyvL{r|1G5oV0vXSy%0t}lvY)A&BM^Z2YO4ZiJ*&ul&7)OY2}
z?jYf&So2WhI~H4u=HGe6$#`JTV-5y0#tUhwq3@1~{`ti}WyVgk_nYn)t1MSNwBs&s
z%f1~~-9ApgZt&{DMsLF~x$Ifyzy3HaEI;*f;{zG4e5S9CV#<zY23(8>wybVoNDyXl
zRQ}oab-CKnt>^!&x3Y}7abZ{PI=27sPQ@p!zVJMF>2BfROOq2mT<dSW&+GU>@pDiG
zgT~#@&1<Ie%#>$55R=8iAkE;g{p-oFKc)Zk)wUQ;-`6Ws*r|TA<^JtyJv{q2?aAGi
zQK5YOPs-!mJKgKjm$T{0%s9!_a*CPZn9G#Ef(&O=-5EA8Hsn7KeWIoNE;_!tpnK<+
z+$RwgDn}+Yrb;iq=xKdtwZiMH&$9&U&Ha9C2q+h0`n&SlyN!Z^9G|!8O`ZnIP9-2$
zXxyB?|M`FUoVT{N%6DUaO|o34K3CjK@A`U!bCGx63)NcuK5boa)Z(Q1Bk|eAE4l@i
z?28W-{deG|-Q4-CJ{vdZH!>vLo6ExB$xxE0{!cFRncP$M-jjW|v+kub%s%HQZlt3u
zekbGVqx(5mALYG@ofs}~s`$sNw1waQoKax#IOumZx7AslVMe(yqk|BG+wyAy46pfH
zXM4vPvA4aK)3^AX&%)3X)N)wlx}o{M=o|NVC*?nj<56d3cfD@d+OUd2VO_ohgTZ?*
zrUn&;QyaB+RZI@^H_={M;&yi{cmBP-Db?p~^8~7Tgcl3kPBwkjH?u1-<e^&5ViBj~
zrmZ=D_<Qa~@^h7Iv-6v4v9aFhJUJ&}R)Qe|2jhV?=6C-4F-%}!@QeEUwEEwY(7A!V
zYri+O3ROP}n^hO+ns(n?`iRbt>e*Zc=B`f-61ewV>D_-g-{Z!5^*;s<r$WmjUY(h`
zdBguZfj0^?n8b3U^Qw0nRWdy5as?UM_T$*^Ulno(ZhSR9voufnxc>2WEye@Sjej<p
zZ;aJ?ufAil6#x1!57vK7XFkwoVI$V-zweBm#Y`q`zdsz@Hyu^?sFWUh=Vp*}{CebX
zkq?_fViV66Im}36I#sq|Jsay<<E=8+e+Y84pO>GUyDrnR=Rh-;&Zk!M)0fLiL(3dH
zf7>u@b1Xe@X_oW8XQ#Z)8EiOBbd_6Ur_ExJIQ>BDwx4YEYXzD8a=f=A4+I|#P+*vm
zwat+&p0#1(?>{=x-u}M+Q$ePNMD?`hr`=gpU%yGUUih+ja`cRS-BWoKz1@GvF!bEB
zH~e}mUtP=fsYl|$wHeK=d-icO$mRU`zsB*(t?%vEH(#)N9r^K-pR3o*(DT}Rf4a}$
zF0b^i`mMV@G`cTOl_BDN-ufvEEE&3s87i`S10VEHSgO3WY}SiiyEIgqc=$MM52Za>
zuNo76O>EDbFCUk^i?01##Ni-!V7-t6Lj;RMZSx9Ki?X<l<$H}5KMWNSw02*~{$YOP
zpH7FI)8~S#r*2!C^WG{ij)Bo(Wyex2WssJ&o_{2BWA<;`oEy62d&pXblxhy&X`yCw
z&TQGtKL7f(G~-=@3@%nTPgim<h%qLJeExqkEZ^hk+Rc~lZ{{lrdBymERc+5wpFi8}
zy4sC{x1CXEh<KT!|5TMBf~6tw#;dMc`^)!IlgqD$b1{5jku$Y8FL34&+p0frZMOC^
zEC^cA^-75$f`Q>3L(Lt9clCQUWkpIk_e<SjHqh9$t%%{zV&?yH`?j;!uij!CF1(J>
z?fco6g%@NRf&{%o-5547F!V&9-~E++>aP2nE(XaeL~-OlcqtkeYstX%{fRznl15=m
z-zs^xuaz5<-zl;)I!rBj`dSfWom`fol=1o7-@0q`Ii?(`_`m3Mb=ar9c?D_@@^zLq
zo-$^<ab%YBK4pG~1?%_DY-LDbWT<#QUyxzjyc;XG-Zx;GA$nNsZ1mLxeTH4HKbGfd
z<_3SiAW*R`c;lMh5dZC(O!2-MOpndaw(h*Ra6`#+uZYd{!Y(rR`PB92hyIGuo_f*G
zLHp9BIoGe3F<qOLv4^GN-!av-mn>xWhjTOBoBg9LF=Dg#$LUkIX@0u%Cnont2G@Td
z*OzkdwJY;vs{g0%4m;d-c;bfNZxk(x9$L)VRU@T$Z^wxTV&`qQ`7#73RhdrxA;qBe
zH)2+{PXA_(1Du}QubSLiFiko9@K%NgmtP)ZpZ)E)T+pp$&f#WHvzjk1)Cy&=C{5;n
z(7INlXwA`2S{F((MLFVPSYPR`;VOL|+Wi0ATE2ta_u8&4ly|y5HQr%A@BijRLEf7&
z-n>&cEj#S6De6f!gGQ<V^N0CwwX%7cnmz@KvL7hTc%Zo{@W;fAo9iA=vp(*3=V{Hp
zJca-phR^R7TQYDLGw7E;XWyoA_p@`c=j}6~Hq6xcrT1U0`fvQ-$xk+VcK)5c9D9}P
z{_hfE$kA$Tdc?xO&0r8^T%UcxoNL#iV$rg9cRrga-njF?O^)S&jI`p;%C(+eds+W3
z%KFPD&(u)1)v%U<@c<LUysV@A%-`gXK7U@hciX?7t=(oW;f$M{ii(+99_{bFZ*V%K
zaZQTHd5>nt=z4x3FNO_Dwzid=3{4CNEEwu@4)HVJ%L((h-8*^lwNUlr8InvTG14g<
z4F|j4a~^osbK{?BCBv<)u74Oo&O4D`z*;e#mHDWu-pt^yo(FRH8Q=4Kxz?zV^Xtgn
zUQUKdRtpwOFgge@#M;i8^Ll&El)il@L(^YuY>cvDU~%}DP}gudubWLfU!3jPnKpi2
z#wp#`i&|M292qK#rn+nFi<o@9ySx9}MJ9$l$`2adT6e@b+^+nqqdg_E@n?Ir0K=J<
zCr9@SGq5l=EIiN~^ORHidB*!qKihY|W^8ER*(<iWT08&xq-16ehEq$m;uS&e(7owr
zq|9(8b$Y~$e=nIB{POIs&5@UlU}q>gmwG|KVf(ci*Zmm;SR57yJf7U}kE<bHZJXhB
zg>K7hb7b7*8eC_-Jmbd@z|gQ^@9UCpfnj%z`Tp2ds_i<aKk58r_77KoTsw7p>oXBX
zhn)erAs!%wQ)ew^O#bg@e<AF&3<J}Hm)HLA`dKkd_?%TN#dKpsjH@ds+&SWsY*-4c
z82(*4R?Tpurc8~OQABcmR~83D6T^z#8x}oOQDAh45#?lfwCR(ZA5((@L(_DL`LmQ6
zI#z2jI>dzCJK@P7z|ychl!2*X$0{L)BdJe&=YYDT7i131j#7(wzxGgoi$dh2pFu7P
z{&EKn$tG^{711;Q?7*(;)wP;|g@LJIgHo08VtvL1FE<^y&AB33vf%K{`5B@IX1k?)
z(vf1~;A4!cwBR;S{*?YUc9wW_V<|&}8B=Dss5id?0|(QBw_1-6NG4x9yFsO7=9x;y
zhGTEs;;-(%s(ySD`+}$yX0Mb%iXL0>Pb@xk?Dh+$jf=ed{?&E)rF5^)kjs~6iz=((
zV02h>dheue1_cfV8}s}UDFc-+?r-NV)mG?OUcq4H$E;_0Z9c<-*ytnj4h#Y;40W3C
z%{%5?F089B?DT#XQ<&5;EtJ8Z;l&!oD>s{zZQ&_TghA)NvhPnv$I_muvDVSy0RcRm
z)6OegQ*31k-elwPn<3@oQ}5Fa7R%~RJ-BiwJ$cqiv%np9j%~iYrGjBzQ`4)CQj1J~
z;ZF=L)v@(%pBPwd8CVYdFV#6UmwkodhwQhuqJ??u#2700xYyMc6<_Il&w<Dr6`K6(
z*>2Y<hHx|7s`{8T;mjEyi9KJ1nHqM~W}WwB*uc;*>91FjZ9{!2N7I%sCTr(zeg8>H
zm*GHkac`J;nrpjOZg5eQ(wF{U4GarHR(%82Tnr9J6PNBd_9<oaBv3DM?>qy|+BZ>C
z#26~LN;Z{zms*<Z<*|>eR_UG^gT~ZVdrxsNh%tOP_rrV#!-@F)0x_OD($=f{c+KBi
z>cGwLZ}$O<3n$y0A9~#unO<QOF0G+5Bj}?SxQ=N!pEkw3Wcv5Hwi;I%7qzZanRkt;
zK|f7$d*<_#wu{!QPtkvNjE|{d!je7HJ3%$YS21aKR<7II9kbWp_1n3Qm0|1hDaI|g
zPM%JmvMtm9ju%ryQ0J}nJs_p?)?Jd@oVV-my$=D-ZfRCux>hWdVKP0w_Z+K3BU|f(
zTW_VkZg2VM^KLJX2}^)h+)A(?8fK?)nLN3__<G?%hLwB*x>GoJw0zrG#1JACH;cPL
zeb%&=mL)6~uM3}gUNx_gK|#fA?M#r@A81zj&7Ii0rA#EuuC9DT5yO;M|E0tk{^x{C
z23-o8vMuw~zH1;`0)I~xWYA$?C}$RX6*wo`Ky}ykrk*oAzil5aY`e*Bt;v4iG~4Xi
zaj!q_yR_|rK-!OQ`Wy^iOSASHF*Ud{OfkQ~{h{Kr(1a<IQue#sT={UiGw~GThwb0~
zygmD#Z|&+Wx}BQl3-X`rW?@(wv^8Fm@qiLT*8h-e1=s%kI4S|Q<HHThQ;Z*09OOLS
zc6paZ?&+P;?RW3Zea0}QD`FMc4wEkht~VaZYA>~N+;ZWdw)9k{1+SN7wHdr#YjNV_
zJMTmmhKqgQlI%dvDY+NG`z}9XLbk=-dbwp=U+dkoTPMPBw$9Lw-5|Jd!Q~Az0$CW=
z-ck&=1UaNY^})<-e+rA&KK%Nm%5g(T(J$E-vLB}zanzVDZ(7JMP?<CPL3C&8@63E|
zriK|S_RQ*LNDyS$A(XJC<XgYl)2;Kk&ZMm7Q7*4p%){U|yFrdak7@cNeeK{QQ@*H3
zh{VojSm3khm6j5N2g8HIn#Y724GWiF`O3F^S!Me!P38mHY}E|&vZFm;$}ucn$nDFN
z6)L*$6eoia!v~YHd4d}~JU(oix$Vfg5VnT><q!B%?@9ex`{s4w>D=8PjK9z2Wbitw
z6DrB*z{GI(#+#pyb-N0VpZ}`1efleoi%#nKZ$g+DVi+|N3})W+{J8BIxVmt$zH#~|
z2ZIp9fy#y?Mb#e{8*hcP^3*PUJ$=eFhFYcj8+jYq?4{@D@Z8<%b@TP|RF%UQa_2wg
zWYANS*{rL6kvq)h$>J3UHr;xX9oSf0_Q~B|Qhu>**~gZg$-bu_E?l5FN3wKv*RN|4
z|1=M@ON+L4n?Lrs?`(4TXNz*1+lp$Ag0JTynHoIZC$cNNWPETjVR5%p+qzjQS@J<Y
z&F0R{i{AME@8Q)k{LjAL+bWrKrP5%XdqZ)PmpQ|`CC8lCe|WVmHC1$--p`ZF6D}2n
zotSRRaEJdx%<`ldWv*BMTXQD2o;rHBZ{yM%ve(!o^U_{zE?IKHx+CRK>S@m1(obiy
zPnb4w(Nm7Ct_lJSE>l{kAD_<H;1zK9K(F3~1sj6QZ-tswY|6W{?$@RGZTxDVryCaj
z{ePnM@us^^!`@Y0vSibGtf1y5=g^t=UbCA0y7CFJ-teenmh+q$CcO2HXLmR)8mh4W
z;MS<c*Zn5vZVTAC;xqS>DZ;kmi-j9jP5*B;|LdNVOp*Q%NBgd}rYKC(v?<%RaE`$N
z?saWDmgT)sifCP+z|c`LMc9@hWRf_~u}k?Ha^Aa7vG-r+J0X}HACkC#ZaCw+)&Do$
zzMvZaw`oIAVvO^bpkr^=yuLW0M@h*3@+zG>p8J$no9#Tca8A)WCj|z<JE3(ty!|Gp
zYp*{R*4a~i*Yj<{--lZTgaU&_SvVLr*}i-&#~?L#qV(+fN3Yy2|284#a_gzJc9!QR
zO)5)2_5b|2Kb75Gwf4<DJf)1j=Z?HLt~FoG8`^K8$96qGUVKuc$1?9X0-^uU-e=6K
zt!vyWpV&Tq;e&v;JGY5GJYA@pnD-@U$HWTb)mD4<E2td*%ett*^n^Quz)O|oRSXqY
z9|EWAdw%n^_DwIDoVzQ)vPUFG)$f7&<x_?G|FPb<VgKp}-@^2+w5Sr5BO(m3Gv4&%
zsamZm&||tUY1`%7zBoZ{_gjw3yPBgPe3`oW&Sq&AhKq66=A7r0V+h(WRIFav^~YuN
z^#`k-aXXjAM(J%)y3nQ@E!Fty_fAExYNLO7b3TZF+4$^_>{RdawPC;f!a&u^#A(O&
z_%SlP<E&U9XdhK@KXtLG7e|E5p%R1NxBhL|C}nfMb^kkglLy{U7oG{5FO&W2>-n<j
zy-7OXF33b53|=n4uw~Vnil=^z3|hrI75`K-7dmNI=V;z5%C-!SnA0Hn`*vY3-`yN#
zW$oL$`##<HZ=v&2{O3FahE@F!-+QdF^Y}mYwOf!HL&RnK+?{h-7``ycnS5Y!63JU<
zC}cKoC%>&(gXF#U*7pl0^_D;4S3mg5FYEN9fA_=gl_wf1xAw{(ylJt;sQky5<!Y)A
zqMCMfI%xB%GDLv=#KfRg{8TV?$EiQhpDlfG=PS3A>euY6J6gXV`I`G7ImNl6_Cj`m
zf<^g@P3%qFhplyPy>B}_F^W$oc4u)^#hdxIEC*6|F2B9!(A3%Q7GHhBxZ&=$TU#$3
zW1hptP_kV<|K$8DtE_j<<@Jov?piL$Ki8gZ^Wtd-I<8JmJoIbkhOGZ?-(0VjHyh^t
zo?F;p&tn+vwmP%mb<xs&^PQ{Qc5OYTeZp6+fk|=IibI(U4zB-;%x-5KzBVH^ob_FL
z_POkvmnQH3_w7jHmH3^_=5w#H@60`Qa@ze@%(M6E88J0ncRg3XK$x*XK;zzamFr7&
zZ>+SMEzt8_@a3xNUTIJ9goH2d(~kXH7w4GU{P^nnvfA*UTCI_%IT_M~K3%#$m#d-g
zb<=~BVQkKf+pdOu7fp(LHE+%FC7T-LwH^sSh;i6xS5sh?EWK)vrm@Wtm*~d5D_z;n
z7ilqkcrA8D>D>pXyt~KK9;oNcdCPoh>whkbcky*eJJ#yg`}s3G4~Tnn>i+r*)h{{L
z3LL1M3>s^{deU%OS@^88`5X3M4oip(EjD5ZFwFATJ^pR(?(^(6cUDAP+ZK}k-$=13
zHguWQ1Gc=Vs@ek06UQx6BkR4`k2<gL*-`mjDB;4Tlhw1e_ZBzyF>7DQTh7cdbwS%f
zx9Q8HrZn!I#m}wzg6XhUSq#tBRD(!4*SoEv598k~S^E0q(dV~A8$U{?9Xe}WRIFKk
zIq&ex+0_Y;XRb8J^bbCLdKy!FO?ZEY4MU{s7j}jRH?F-{bHI4*>4W=j9NzTk<l>^4
z0=0D$!ycdC>At}7_L-KC+=b@K@5C#1cqW={(PBBjtxk5|%o{>#d9ye#8s1j?_A7GR
z>W^G1YWJD$h)kVO!@KT|<>amUO#44nZ2q*w))zF5a;i<I$v}bOMAj;M28O9DiVa?8
zr1=zB7Wu!KBswwt^uwLZcb>1m^;X<uiH_wX0mkQCF~Q$`uP!YAar=V$qu3YXq1~>2
zb=K$aU0!O-!VszZRh%J3`-uAG(}n!J54T<489n_}*GcWCdCOxa-+Q5)^`LH6KZC;R
zh5y(XLO!US);b(-IlcSY>UfS>=il&^2Te*jx^(TGgWA#|=X<Je^PWHbT#zBf^s+o-
zgMfqiHluFE1KiqiPugc~2)rCuyZW!dbO~l-{*n{kk3Y7j3p1?IiYu$DXLZ=N`gTpF
zsK%w$EYY7%?G2eRzmj==e<qu|{)^oSM^^Y3<o<U$ba9OYv(|d0@4?^WSOP#jj^`Si
zD^#|z+_rlo74pPUY}M<}8_z2KxnZ{UdSCMY1rOi%Mzh+#&3<V(rJO-}Q^&^7pFopp
zNr}sDujgdyx%oe7`=h*#tX+RUn0<*bk|~>ai@QAd-KnlC8)W2E=be~#^2C9ozfLvH
z;b7Qw>(zT_27j-X=bZbZ0|e!==2%~mm}l~*dN!9q#nFn$jZ)L1C5^in6e>gKwC_`4
zIFXg5z^o9xu;<&c=`X)dTob{2T6V9PBZC5i#&zwNT$~K~P8U4trYv-yEfOwg#Jyhb
zy?)`%4%TuD0Y+!J1|3EYh8%wzX*P+Y=i;~4PhOM3ds^4(lC?l@NcwC}hD}jk3>C)N
zr(ZMYytn3Onk&vXNpx+ZrH#hq@aWpVS0;nfg(l;J>ynu<q7N7sl$__E!v6ip(*rMm
z-+uK+i7o1`cFNcL(oZ!sR{Zjmf6DdmU5oh+hKdajwF{nQttqnIS@N6Z%T|Hg_x<<Z
zS@o-M*(biB2t~#Nj0_o~VXf86<*Qg1U-u1P!M8tr>;F$y`E#a*r>5+S@vqmFU9uvG
zsezfHA^t{v$%Ff^y2GmzEwp9#Pc|<*^y4mXhTnm<z85dVr<Mva<dm#4kB#>~+%RLu
zWvx=B@K_0Eg>Tm!Ir``Fa`Sy{51g2rkdl%uv3;xU@Bg(SZ0El`UBBba?w5+258YE^
zuwY@3y~bA9-1Ep_!ShM-qN`deLM7s|8Qw~NU}67SzP_`(KfsTv!I`1qo?B<#pA9$9
zZ(lt}y^w{2VcB!GMXhTL_>Bb_WLO&1ytSqM*!=n<o|Kv@F;uWMT(@?4)X2iX&d9L0
z;gGF&!E~1HO_!Tat~@EEr4Zl3@Ia73^3$ZRah^;KhZ!zRX%#trzH?@OF{7~AnNRbc
zZBQ3vuwi=85pM1LDUpSt9c0KRXRpG&4g0s%Ft1aKnI6LW`X~p(F@_C#XZL72G88B<
ze5g4Ptm9^vU;SbF<EX6L;ty6WVqtJ*P<hsC8C|c%c%YHNL0_T5Q?<-vg@QPf@ZOT|
z3XBH?7%DgGW#9eR$nYS5L4n0?ZrnU;`40h$7cF?a!l062+3C6+>Ia@*|5yA?neo6u
z1_zEBo3%3Ldwwi_vuWbf>g%30!biF%us`5qDSY`8G!Sr@u|eQRUY%>j8dt&X4;ki(
z$!tlIS+Z<t)<rX>25APqEWs_uyf_)^7#La@+(h(@KbV^5Gc<REz5UOcllq;1m7R$T
z!wFV~`@1iBGRUwn*fSo;pWeG>1yd^f^d|RNqUW9pig4)hyyyKb-|{Z%Y~F>v$_u2P
zMZQ~d?@agYvQ++O8M^6uy7$jGGJG&*NNHwRFMoK$qfoagjnj9Fx7%;m`V^h9ae4HV
z#(sCxHpN8YgtLuj3;qQ0#H9abH;OP>FlYal9+Mq&i)24^ZCHF=De-md(T0VGpUeDW
zJoau4JM$v@6t~dW)rpm#k1Xv?@BQri*{oihsbN0TfzX+|H?Q8hJ8u=++#9vbx#6K_
zr&_H^yq>$hntNAn4Lh65wZ?_F?V24gmPUjuDBs-oJE+H@fAjy%XV0D~FBV{6Vqq}b
zm-nUh`D+ig$uCvzo91pbS7s1kIB{U@>xOdw*v^}qLiCs#zMfNW=FFM-cETnTd0iI<
zj+|7r8J%D4cm3{*ek`8I$LQe0cp`ww+b`q8N1eB+Ck=o9a^<;a%Fn2<L1ebWvwQcq
z&zLBmm}%&(Xyo?fi4h9}lfwcB#fg$X0;f&0xS0^T-<q+3;Xyvbj_UIloNw0uUSTFt
zzq+5nfuTT)A!tUUd~&9ww_WY;K7D7<#Q%p<h9$<#{fU{D-psW(XUzGL$HKtWu%1Do
zS@MVEv_lb6Z(Nd#9$5=Ba4_6sVbEK@bW=&+(yKbWrHd~9xC|EF#W3Lv&mSA_>`19+
z{%()`a}^l`7~U{3q~E=G;rfr?%OvZK{=C@+Dr6Ti9MHGg_3m|q)XV;30v)-ZN*P=}
zCf%R?H~L|ms>{?_pLQ|}Ouv5Ng83#BD}i363Af%{W;oE7aIEg$nFq1|{TKwe;(JeL
zzu1+Zc5<U&F4M_~(k)k?GZyeO8HOo1fYMt`-0l-W7T&@o8iH3}#&B9NF??6p;4i|&
z$kTB8%n9X_7v^S9xK~$voZ*2SOUpABCI$xccapmvI|o%pKYUraQ}uxc!=2^>QpWxV
z`WYJBLl;NRa_aIHx}eB-obiDii&$k-!(oPo$%Pp&Zb!^owRrMMzex=fS!6gHss(18
zQJ8R&xv`&#fme3%nKucURx4FJ4~VNghya-=Ajk4af+6FDdE~95mwe)1q*Sp_YPes?
zU@3h>VZyx2!XJbf3MzTk9~<P&S*+i#@R=iq)8ZC$L8C*K8H)%rga3wy;<fUURS%@P
z_HVnB&rp!>F`-9b17kyu^ZeKAW&PeNaX$G~@N2e(1cMMO!-NC-p8bxT^*;aY@^2GZ
z)_5FPZ`1ImO`KP=F}c|0#pENG9H)sz335GE<z(q%`6I;8c&YM=-=v0EP638DUK37D
zW|7fhWNK)(?vI<Rk`T_s!mwLt$tM*?cJBs;2M^9I4p-;AF_nSwz&e(dHl7C#3MnvH
z?D+iRswY#KssqCYZAUGCp@I!891MK#Y^qA>ZtQ=4XX7*6KYeR!7#J8BJYD@<);T3K
F0RV3Jo>>3@