From bd38e503bf283e48d5c3f7cf3d4b85576aa9474b Mon Sep 17 00:00:00 2001
From: Vidar Tonaas Fauske <vidartf@gmail.com>
Date: Thu, 18 Apr 2019 01:40:25 +0100
Subject: [PATCH] Fix ArrowHelper

---
 js/scripts/three-class-config.js | 11 ++--
 js/src/helpers/ArrowHelper.js    | 86 ++++++++++++++++++++++++++++++++
 2 files changed, 92 insertions(+), 5 deletions(-)
 create mode 100644 js/src/helpers/ArrowHelper.js

diff --git a/js/scripts/three-class-config.js b/js/scripts/three-class-config.js
index bdb11382..033dbeea 100644
--- a/js/scripts/three-class-config.js
+++ b/js/scripts/three-class-config.js
@@ -1814,15 +1814,16 @@ module.exports = {
     },
     ArrowHelper: {
         relativePath: './helpers/ArrowHelper',
-        superClass: 'Object3D',
+        superClass: 'Blackbox',
         properties: {
-            dir: new Types.Vector3(1, 0, 0),
+            dir: new Types.Vector3(0, 0, 1),
             origin: new Types.Vector3(0, 0, 0),
             length: new Types.Float(1.0),
-            hex: new Types.Int(0),
-            headLength: new Types.Float(null, {nullable: true}),
-            headWidth: new Types.Float(null, {nullable: true}),
+            color: new Types.Color('#ffff00'),
+            headLength: new Types.Float(undefined, {nullable: true}),
+            headWidth: new Types.Float(undefined, {nullable: true}),
         },
+        constructorArgs: ['dir', 'origin', 'length', 'color', 'headLength', 'headWidth'],
     },
     AxesHelper: {
         relativePath: './helpers/AxesHelper',
diff --git a/js/src/helpers/ArrowHelper.js b/js/src/helpers/ArrowHelper.js
new file mode 100644
index 00000000..97c3bb08
--- /dev/null
+++ b/js/src/helpers/ArrowHelper.js
@@ -0,0 +1,86 @@
+var ArrowHelperAutogen = require('./ArrowHelper.autogen').ArrowHelperModel;
+
+var THREE = require('three');
+
+var ArrowHelperModel = ArrowHelperAutogen.extend({
+
+    constructThreeObject: function() {
+
+        var headLength = this.get('headLength');
+        var headWidth = this.get('headWidth');
+
+        if (headLength === null) {
+            headLength = undefined;
+        }
+        if (headWidth === null) {
+            headWidth = undefined;
+        }
+
+        var result = new THREE.ArrowHelper(
+            this.convertVectorModelToThree(this.get('dir'), 'dir'),
+            this.convertVectorModelToThree(this.get('origin'), 'origin'),
+            this.convertFloatModelToThree(this.get('length'), 'length'),
+            this.convertColorModelToThree(this.get('color'), 'color'),
+            this.convertFloatModelToThree(headLength, 'headLength'),
+            this.convertFloatModelToThree(headWidth, 'headWidth')
+        );
+        return Promise.resolve(result);
+
+    },
+
+
+    createPropertiesArrays: function() {
+        ArrowHelperAutogen.prototype.createPropertiesArrays.call(this);
+
+        // Prevent from syncing these to object
+        delete this.property_converters['origin'];
+
+        // Map with setDirection
+        delete this.property_converters['dir'];
+
+        // Map with setColor
+        delete this.property_converters['color'];
+
+        // Map these to setLength instead
+        delete this.property_converters['length'];
+        delete this.property_converters['headLength'];
+        delete this.property_converters['headWidth'];
+
+        this.property_mappers['mapArrowHelper'] = 'mapArrowHelper';
+    },
+
+    mapArrowHelperModelToThree: function() {
+        var headLength = this.get('headLength');
+        var headWidth = this.get('headWidth');
+
+        if (headLength === null) {
+            headLength = undefined;
+        }
+        if (headWidth === null) {
+            headWidth = undefined;
+        }
+
+        this.obj.setDirection(this.convertVectorModelToThree(this.get('dir'), 'dir'));
+        this.obj.setColor(this.convertColorModelToThree(this.get('color'), 'color'));
+        this.obj.position.copy(this.convertVectorModelToThree(this.get('origin'), 'origin'));
+
+        this.obj.setLength(
+            this.convertFloatModelToThree(this.get('length'), 'length'),
+            this.convertFloatModelToThree(headLength, 'headLength'),
+            this.convertFloatModelToThree(headWidth, 'headWidth')
+        );
+    },
+
+    mapArrowHelperThreeToModel: function() {
+        this.set({
+            headLength: this.convertFloatThreeToModel(this.obj.cone.scale.y, 'headLength'),
+            headWidth: this.convertFloatThreeToModel(this.obj.cone.scale.x, 'headWidth'),
+            origin: this.convertVectorThreeToModel(this.obj.position, 'origin'),
+        });
+    }
+
+});
+
+module.exports = {
+    ArrowHelperModel: ArrowHelperModel,
+};