Chore: Remove autobind from 3d controls (#508)

box · Nov 22, 2017 · 5aa3bc8 · 5aa3bc8
1 parent 4fd7eda
commit 5aa3bc8
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 8 deletions.
diff --git a/src/lib/viewers/box3d/Box3DControls.js b/src/lib/viewers/box3d/Box3DControls.js
@@ -1,5 +1,4 @@
 import EventEmitter from 'events';
-import autobind from 'autobind-decorator';
 import Controls from '../../Controls';
 import { EVENT_RESET, EVENT_SCENE_LOADED, EVENT_TOGGLE_FULLSCREEN, EVENT_TOGGLE_VR } from './box3DConstants';
 import { ICON_FULLSCREEN_IN, ICON_FULLSCREEN_OUT, ICON_3D_VR } from '../../icons/icons';
@@ -8,7 +7,6 @@ import './Box3DControls.scss';
 import { CLASS_HIDDEN } from '../../constants';
 import { UIRegistry } from './Box3DUIUtils';
 
-@autobind
 class Box3DControls extends EventEmitter {
     /** @property {HTMLElement} - Reference to the parent container to nest UI in */
     el;
@@ -41,6 +39,10 @@ class Box3DControls extends EventEmitter {
         this.controls = new Controls(this.el);
 
         this.uiRegistry = new UIRegistry();
+
+        this.handleToggleFullscreen = this.handleToggleFullscreen.bind(this);
+        this.handleToggleVr = this.handleToggleVr.bind(this);
+        this.handleReset = this.handleReset.bind(this);
     }
 
     /**

diff --git a/src/lib/viewers/box3d/model3d/Model3DControls.js b/src/lib/viewers/box3d/model3d/Model3DControls.js
@@ -1,4 +1,3 @@
-import autobind from 'autobind-decorator';
 import Box3DControls from '../Box3DControls';
 import Model3DAnimationClipsPullup from './Model3DAnimationClipsPullup';
 import Model3DSettingsPullup from './Model3DSettingsPullup';
@@ -25,7 +24,6 @@ import { ICON_3D_RESET, ICON_ANIMATION, ICON_GEAR, ICON_PAUSE, ICON_PLAY } from
  * This class handles the UI for 3d preview controls. This includes Reset,
  * Render Mode selection, VR and fullscreen buttons.
  */
-@autobind
 class Model3DControls extends Box3DControls {
     /** @property {Model3DAnimationClipsPullup} - UI Component for listing and interacting with animation clips */
     animationClipsPullup;
@@ -57,8 +55,21 @@ class Model3DControls extends Box3DControls {
      */
     constructor(containerEl) {
         super(containerEl);
+
         this.animationClipsPullup = new Model3DAnimationClipsPullup(containerEl);
         this.settingsPullup = new Model3DSettingsPullup();
+
+        this.handleSelectAnimationClip = this.handleSelectAnimationClip.bind(this);
+        this.handleToggleAnimation = this.handleToggleAnimation.bind(this);
+        this.handleToggleAnimationClips = this.handleToggleAnimationClips.bind(this);
+        this.handleToggleSettings = this.handleToggleSettings.bind(this);
+
+        this.handleSetRenderMode = this.handleSetRenderMode.bind(this);
+        this.handleSetSkeletonsVisible = this.handleSetSkeletonsVisible.bind(this);
+        this.handleSetWireframesVisible = this.handleSetWireframesVisible.bind(this);
+        this.handleSetGridVisible = this.handleSetGridVisible.bind(this);
+        this.handleSetCameraProjection = this.handleSetCameraProjection.bind(this);
+        this.handleAxisRotation = this.handleAxisRotation.bind(this);
     }
 
     /** @inheritdoc */

diff --git a/src/lib/viewers/box3d/model3d/Model3DVrControls.js b/src/lib/viewers/box3d/model3d/Model3DVrControls.js
@@ -1,5 +1,4 @@
 /* global THREE */
-import autobind from 'autobind-decorator';
 
 /** The various object manipulation modes supported. */
 const controlType = {
@@ -52,10 +51,15 @@ class Model3DVrControls {
     constructor(vrGamepads, box3dEngine) {
         this.vrGamepads = vrGamepads;
         this.box3d = box3dEngine;
+
+        this.onScaleUpdate = this.onScaleUpdate.bind(this);
+        this.onGamepadButtonDown = this.onGamepadButtonDown.bind(this);
+        this.onGamepadButtonUp = this.onGamepadButtonUp.bind(this);
+
         // Listen for gamepad button events to trigger actions.
         this.vrGamepads.forEach((gamepad) => {
-            gamepad.listenTo(gamepad, 'gamepadButtonDown', this.onGamepadButtonDown.bind(this));
-            gamepad.listenTo(gamepad, 'gamepadButtonUp', this.onGamepadButtonUp.bind(this));
+            gamepad.listenTo(gamepad, 'gamepadButtonDown', this.onGamepadButtonDown);
+            gamepad.listenTo(gamepad, 'gamepadButtonUp', this.onGamepadButtonUp);
         });
         this.controllerState = {
             initiatingController: null,
@@ -125,7 +129,6 @@ class Model3DVrControls {
      *
      * @return {void}
      */
-    @autobind
     onScaleUpdate() {
         this.vrGamepads[0].getPosition(this.vrWorkVector1);
         this.vrGamepads[1].getPosition(this.vrWorkVector2);