Skip to content

Commit 3a29ac5

Browse files
kalwaltkalwalt
committed
missed matrix makeRotationX in arjs-markercontrols
- restoring code from PR #60
1 parent 8ffcff5 commit 3a29ac5

File tree

8 files changed

+10
-7
lines changed

8 files changed

+10
-7
lines changed

‎aframe/build/aframe-ar-nft.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎aframe/build/aframe-ar.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎three.js/build/ar-nft.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎three.js/build/ar-threex-nft.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎three.js/build/ar-threex.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎three.js/build/ar.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎three.js/examples/basic.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- three.js library -->
44
<script src='vendor/three.js/build/three.min.js'></script>
55
<!-- ar.js -->
6-
<script src="../build/ar.js"></script>
6+
<script src="../build/ar-threex.js"></script>
77
<script>THREEx.ArToolkitContext.baseURL = '../'</script>
88

99
<body style='margin : 0px; overflow: hidden; font-family: Monospace;'><div style='position: absolute; top: 10px; width:100%; text-align: center; z-index: 1;'>

‎three.js/src/threex/arjs-markercontrols.js‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,9 @@ MarkerControls.prototype.updateWithModelViewMatrix = function(modelViewMatrix){
118118
modelViewMatrix.copy(tmpMatrix)
119119
}else console.assert(false)
120120

121+
// change axis orientation on marker - artoolkit say Z is normal to the marker - ar.js say Y is normal to the marker
122+
var markerAxisTransformMatrix = new THREE.Matrix4().makeRotationX(Math.PI/2)
123+
modelViewMatrix.multiply(markerAxisTransformMatrix)
121124

122125
var renderReqd = false;
123126

0 commit comments

Comments
 (0)