From 37fa163b656a8795727046e363053e99442a46f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Wilk?= <michal.wilk@euvic.pl>
Date: Thu, 18 Apr 2024 18:23:01 +0200
Subject: [PATCH] fix: camera controls ignored props

---
 src/core/controls/CameraControls.vue | 36 ++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/core/controls/CameraControls.vue b/src/core/controls/CameraControls.vue
index 48557323..24515808 100644
--- a/src/core/controls/CameraControls.vue
+++ b/src/core/controls/CameraControls.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import CameraControls from 'camera-controls'
-import { ref, watchEffect, onUnmounted, toRefs } from 'vue'
+import { ref, watchEffect, onUnmounted, toRefs, computed } from 'vue'
 import type {
   PerspectiveCamera,
   OrthographicCamera,
@@ -321,9 +321,8 @@ const props = withDefaults(defineProps<CameraControlsProps>(), {
   boundaryFriction: 0.0,
   restThreshold: 0.01,
   colliderMeshes: () => [],
-  // FIXME: set default values for mouseButtons and touches
-  // mouseButtons: {},
-  // touches: {}
+  mouseButtons: () => defaultMouseButtons,
+  touches: () => defaultTouches,
 })
 
 const emit = defineEmits(['change', 'start', 'end'])
@@ -354,8 +353,20 @@ const {
   boundaryFriction,
   restThreshold,
   colliderMeshes,
+  mouseButtons: mouseButtonsRef,
+  touches: touchesRef,
 } = toRefs(props)
 
+const mouseButtons = computed(() => ({
+  ...defaultMouseButtons,
+  ...mouseButtonsRef.value,
+}))
+
+const touches = computed(() => ({
+  ...defaultTouches,
+  ...touchesRef.value,
+}))
+
 // allow for tree shaking, only importing required classes
 const subsetOfTHREE = {
   Box3,
@@ -411,6 +422,21 @@ defineExpose({
 })
 </script>
 
+<script lang="ts">
+const defaultMouseButtons: CameraControls['mouseButtons'] = {
+  left: CameraControls.ACTION.ROTATE,
+  middle: CameraControls.ACTION.DOLLY,
+  right: CameraControls.ACTION.TRUCK,
+  wheel: CameraControls.ACTION.DOLLY,
+}
+
+const defaultTouches: CameraControls['touches'] = {
+  one: CameraControls.ACTION.TOUCH_ROTATE,
+  two: CameraControls.ACTION.TOUCH_DOLLY_TRUCK,
+  three: CameraControls.ACTION.TOUCH_TRUCK,
+}
+</script>
+
 <template>
   <TresCameraControls
     v-if="(camera || activeCamera) && (domElement || renderer)"
@@ -440,5 +466,7 @@ defineExpose({
     :rest-threshold="restThreshold"
     :collider-meshes="colliderMeshes"
     :args="[camera || activeCamera, domElement || renderer.domElement]"
+    :mouse-buttons="mouseButtons"
+    :touches="touches"
   />
 </template>