瀏覽代碼

Merge pull request #14670 from toji/dev

Updated WebXR input to use XRRays when provided by the browser.
Mr.doob 7 年之前
父節點
當前提交
85f44aa137
共有 1 個文件被更改,包括 10 次插入1 次删除
  1. 10 1
      src/renderers/webvr/WebXRManager.js

+ 10 - 1
src/renderers/webvr/WebXRManager.js

@@ -240,7 +240,16 @@ function WebXRManager( renderer ) {
 
 				if ( inputPose !== null ) {
 
-					controller.matrix.elements = inputPose.pointerMatrix;
+					if ('targetRay' in inputPose) {
+
+						controller.matrix.elements = inputPose.targetRay.transformMatrix;
+
+					} else if ('pointerMatrix' in inputPose) {
+
+						controller.matrix.elements = inputPose.pointerMatrix;
+
+					}
+
 					controller.matrix.decompose( controller.position, controller.rotation, controller.scale );
 					controller.visible = true;