Skip to content

Fix ArrowHelper #259

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions js/scripts/three-class-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
86 changes: 86 additions & 0 deletions js/src/helpers/ArrowHelper.js
Original file line number Diff line number Diff line change
@@ -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,
};