Merge pull request #27 from diarmidmackenzie/deskop-vr-controller-issues

Deskop vr controller issues
diarmidmackenzie · Dec 12, 2023 · 21063dd · 21063dd
2 parents 4de9542 + d547e05
commit 21063dd
Show file tree

Hide file tree

Showing 44 changed files with 171 additions and 2,100 deletions.
diff --git a/assets/cell/scene.bin b/assets/cell/scene.bin
diff --git a/assets/cell/scene.glb b/assets/cell/scene.glb
diff --git a/assets/cell/scene.gltf b/assets/cell/scene.gltf
diff --git a/assets/cell/textures/Material.001_specularGlossiness.png b/assets/cell/textures/Material.001_specularGlossiness.png
diff --git a/assets/cell/textures/Material.003_diffuse.png b/assets/cell/textures/Material.003_diffuse.png
diff --git a/assets/cell/textures/Material.003_emissive.png b/assets/cell/textures/Material.003_emissive.png
diff --git a/assets/cell/textures/Material.003_specularGlossiness.png b/assets/cell/textures/Material.003_specularGlossiness.png
diff --git a/assets/cell/textures/Material.004_diffuse.png b/assets/cell/textures/Material.004_diffuse.png
diff --git a/assets/cell/textures/Material.004_emissive.png b/assets/cell/textures/Material.004_emissive.png
diff --git a/assets/cell/textures/Material.004_specularGlossiness.png b/assets/cell/textures/Material.004_specularGlossiness.png
diff --git a/assets/cell/textures/Material.005_specularGlossiness.png b/assets/cell/textures/Material.005_specularGlossiness.png
diff --git a/assets/cell/textures/Material.006_diffuse.png b/assets/cell/textures/Material.006_diffuse.png
diff --git a/assets/cell/textures/Material.006_emissive.png b/assets/cell/textures/Material.006_emissive.png
diff --git a/assets/cell/textures/Material.006_specularGlossiness.png b/assets/cell/textures/Material.006_specularGlossiness.png
diff --git a/assets/cell/textures/Material.007_diffuse.png b/assets/cell/textures/Material.007_diffuse.png
diff --git a/assets/cell/textures/Material.007_emissive.png b/assets/cell/textures/Material.007_emissive.png
diff --git a/assets/cell/textures/Material.007_specularGlossiness.png b/assets/cell/textures/Material.007_specularGlossiness.png
diff --git a/assets/cell/textures/Material.008_diffuse.png b/assets/cell/textures/Material.008_diffuse.png
diff --git a/assets/cell/textures/Material.008_emissive.png b/assets/cell/textures/Material.008_emissive.png
diff --git a/assets/cell/textures/Material.008_specularGlossiness.png b/assets/cell/textures/Material.008_specularGlossiness.png
diff --git a/assets/cell/textures/Material.009_emissive.png b/assets/cell/textures/Material.009_emissive.png
diff --git a/assets/cell/textures/Material.009_specularGlossiness.png b/assets/cell/textures/Material.009_specularGlossiness.png
diff --git a/assets/cell/textures/Material.010_diffuse.png b/assets/cell/textures/Material.010_diffuse.png
diff --git a/assets/cell/textures/Material.010_specularGlossiness.png b/assets/cell/textures/Material.010_specularGlossiness.png
diff --git a/assets/cell/textures/Material.011_diffuse.png b/assets/cell/textures/Material.011_diffuse.png
diff --git a/assets/cell/textures/Material.011_emissive.png b/assets/cell/textures/Material.011_emissive.png
diff --git a/assets/cell/textures/Material.011_specularGlossiness.png b/assets/cell/textures/Material.011_specularGlossiness.png
diff --git a/assets/cell/textures/Material_diffuse.png b/assets/cell/textures/Material_diffuse.png
diff --git a/assets/cell/textures/Material_emissive.png b/assets/cell/textures/Material_emissive.png
diff --git a/assets/cell/textures/Material_specularGlossiness.png b/assets/cell/textures/Material_specularGlossiness.png
diff --git a/component-usage/low-cost-raycasting.html b/component-usage/low-cost-raycasting.html
@@ -31,7 +31,7 @@
            response-type="arraybuffer" crossorigin="anonymous">
         </a-asset-item>
         <a-asset-item id="cell-model"
-           src="../assets/cell/scene.gltf"
+           src="../assets/cell/scene.glb"
            response-type="arraybuffer" crossorigin="anonymous">
         </a-asset-item>
       </a-assets>

diff --git a/component-usage/mouse-manipulation.html b/component-usage/mouse-manipulation.html
@@ -50,7 +50,7 @@
            response-type="arraybuffer" crossorigin="anonymous">
         </a-asset-item>
         <a-asset-item id="cell-model"
-           src="../assets/cell/scene.gltf"
+           src="../assets/cell/scene.glb"
            response-type="arraybuffer" crossorigin="anonymous">
         </a-asset-item>
       </a-assets>

diff --git a/component-usage/object-manipulation.html b/component-usage/object-manipulation.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <script src="https://aframe.io/releases/1.3.0/aframe.min.js"></script>
+    <script src="https://aframe.io/releases/1.5.0/aframe.min.js"></script>
     <script src="../components/low-cost-raycasting.js"></script>
     <script src="../components/polygon-wireframe/index.js"></script>
     <script src="../components/cursor-tracker/index.js"></script>
@@ -49,7 +49,7 @@
         <a-entity id="rhand"
                   position="0.4 1.4 -0.5"
                   laser-controls="hand: right" raycaster="objects: [raycast-target]; far: Infinity; lineColor: red; lineOpacity: 0.5"
-                  laser-manipulation
+                  laser-manipulation="center:contact; debug: true"
                   thumbstick-states__right="controller:#rhand;
                                             tBindings:moving-in,moving-out,rotating-y-plus,rotating-y-minus;
                                             tgBindings:rotating-x-plus,rotating-x-minus,rotating-y-plus,rotating-y-minus"
@@ -72,24 +72,29 @@
            response-type="arraybuffer" crossorigin="anonymous">
         </a-asset-item>
         <a-asset-item id="cell-model"
-           src="../assets/cell/scene.gltf"
+           src="../assets/cell/scene.glb"
            response-type="arraybuffer" crossorigin="anonymous">
         </a-asset-item>
       </a-assets>
 
       <a-entity id="container"
                 position="0 1 -2">
+          <!-- remove use of adjusted-model component as it's not working with A-Frame 1.5.0
+               for reasons not yet understood.  -->
           <a-entity id="eiffel" position="-2 0 0"
-                    adjusted-model="gltfModel: #eiffel-model;
-                                            dimension: 1">
+                    scale="0.01 0.01 0.01"
+                    gltf-model="#eiffel-model"
+                    raycast-target>
           </a-entity>
           <a-entity id="trex" position="0 0 0"
-                    adjusted-model="gltfModel: #trex-model;
-                                            dimension: 1">
+                    scale="0.01 0.01 0.01"
+                    gltf-model="#trex-model"
+                    raycast-target>
           </a-entity>
-          <a-entity id="cell" position="2 0 0"
-                    adjusted-model="gltfModel: #cell-model;
-                                            dimension: 1">
+          <a-entity id="cell" position="2 0.5 0"
+                    scale="0.15 0.15 0.15"
+                    gltf-model="#cell-model"
+                    raycast-target>
           </a-entity>
       </a-entity>
     </a-scene>

diff --git a/components/desktop-vr-controller/README.md b/components/desktop-vr-controller/README.md
@@ -55,7 +55,7 @@ There's lots of settings that could be usefully configurable, and hopefully will
 ## Installation
 
 ```
-<script src="https://cdn.jsdelivr.net/npm/[email protected].1/dist/desktop-vr-controller.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/[email protected].3/dist/desktop-vr-controller.min.js"></script>
 ```
 
 Or via [npm](https://www.npmjs.com/package/aframe-desktop-vr-controller)

diff --git a/components/desktop-vr-controller/dist/desktop-vr-controller.js b/components/desktop-vr-controller/dist/desktop-vr-controller.js
diff --git a/components/desktop-vr-controller/dist/desktop-vr-controller.min.js b/components/desktop-vr-controller/dist/desktop-vr-controller.min.js
diff --git a/components/desktop-vr-controller/index.js b/components/desktop-vr-controller/index.js
@@ -119,7 +119,7 @@ AFRAME.registerComponent('desktop-vr-controller', {
 
         // If there is an XR session (real or simulated), do nothing.
         const xr = this.el.sceneEl.renderer.xr
-        const xrSession = xr.getSesssion ? xr.getSession() : null
+        const xrSession = xr.getSession ? xr.getSession() : null
         if (xrSession) {
             console.log("desktop-vr-controller suppressed due to presence of an XR session")
             return;

diff --git a/components/desktop-vr-controller/package.json b/components/desktop-vr-controller/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aframe-desktop-vr-controller",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Simulates a VR controller on the desktop, controllable using mouse & keyboard.",
   "main": "index.js",
   "scripts": {

diff --git a/components/dynamic-snap/test/test2.html b/components/dynamic-snap/test/test2.html
@@ -31,7 +31,7 @@
               response-type="arraybuffer" crossorigin="anonymous">
           </a-asset-item>
           <a-asset-item id="cell-model"
-              src="../../../assets/cell/scene.gltf"
+              src="../../../assets/cell/scene.glb"
               response-type="arraybuffer" crossorigin="anonymous">
           </a-asset-item>
         </a-assets>

diff --git a/components/laser-manipulation/README.md b/components/laser-manipulation/README.md
@@ -71,6 +71,7 @@ Apart from the ability to customize thumbstick controls described above, there a
 | grabEvent     | If `grabEvents` is true, the name of the event to generate when an entity is grabbed | mouseGrab    |
 | releaseEvent  | If `grabEvents` is true, the name of the event to generate when an entity is released | mouseRelease |
 | controlMethod | Either 'parent' or 'transform'. <br />'parent' mode re-parents the object to become a descendant of the controller.  This is a simpler method, and may be more performant and stable.  However re-parenting can cause issues if code in other components makes assumptions about objects' positions in the THREE.js scene graph.  'transform' mode leaves the object in the same position in the THREE.js scene graph, and instead adjusts its transform every tick as required. | parent       |
+| debug         | Shows the position & orientation of the contact point.  Also shows rotation axes when rotating about X & Y axes. | false        |
 
 
 
@@ -79,7 +80,7 @@ Apart from the ability to customize thumbstick controls described above, there a
 Via CDN 
 
 ```
-<script src="https://cdn.jsdelivr.net/npm/aframe-laser-manipulation@0.2.0/dist/laser-manipulation.min.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/aframe-laser-manipulation@0.3.0/dist/laser-manipulation.min.js"></script>
 ```
 
 Or via [npm](https://www.npmjs.com/package/aframe-laser-manipulation)

diff --git a/components/laser-manipulation/dist/laser-manipulation.js b/components/laser-manipulation/dist/laser-manipulation.js