Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

⬆️(orbit-controls): update to work with latest aframe 1.4.1 #322

Closed
wants to merge 1 commit into from
Closed

⬆️(orbit-controls): update to work with latest aframe 1.4.1 #322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions components/orbit-controls/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,25 @@ Install and use by directly including the [browser files](dist):
```html
<head>
<title>My A-Frame Scene</title>
<script src="https://aframe.io/releases/0.9.0/aframe.min.js"></script>
<script src="https://unpkg.com/[email protected]/dist/aframe-orbit-controls.min.js"></script>
<script src="https://unpkg.com/[email protected]/dist/aframe-supercraft-loader.js"></script>
<script src="https://aframe.io/releases/1.4.1/aframe.min.js"></script>
<script src="https://unpkg.com/aframe-orbit-controls/dist/aframe-orbit-controls.min.js"></script>
</head>

<body>
<a-scene>
<a-entity supercraft-loader="name: icky-snake"></a-entity>
<a-entity camera look-controls orbit-controls="target: 0 1.6 -0.5; minDistance: 0.5; maxDistance: 180; initialPosition: 0 5 15"></a-entity>
<a-torus-knot
color="#B84A39"
arc="180"
p="2"
q="7"
radius="5"
radius-tubular="0.1"
></a-torus-knot>
<a-entity
camera
look-controls
orbit-controls="target: 0 1.6 -0.5; minDistance: 0.5; maxDistance: 180; initialPosition: 0 5 15"
></a-entity>
</a-scene>
</body>
```
Expand Down
10 changes: 5 additions & 5 deletions components/orbit-controls/dist/aframe-orbit-controls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ THREE.OrbitControls = function ( object, domElement ) {

// so camera.up is the orbit axis
var quat = new THREE.Quaternion().setFromUnitVectors( object.up, new THREE.Vector3( 0, 1, 0 ) );
var quatInverse = quat.clone().inverse();
var quatInverse = quat.clone().invert();

var lastPosition = new THREE.Vector3();
var lastQuaternion = new THREE.Quaternion();
Expand Down Expand Up @@ -1229,12 +1229,12 @@ AFRAME.registerComponent('orbit-controls', {
controls.enableRotate = data.enableRotate;
controls.enableZoom = data.enableZoom;
controls.keyPanSpeed = data.keyPanSpeed;
controls.maxPolarAngle = THREE.Math.degToRad(data.maxPolarAngle);
controls.maxAzimuthAngle = THREE.Math.degToRad(data.maxAzimuthAngle);
controls.maxPolarAngle = THREE.MathUtils.degToRad(data.maxPolarAngle);
controls.maxAzimuthAngle = THREE.MathUtils.degToRad(data.maxAzimuthAngle);
controls.maxDistance = data.maxDistance;
controls.minDistance = data.minDistance;
controls.minPolarAngle = THREE.Math.degToRad(data.minPolarAngle);
controls.minAzimuthAngle = THREE.Math.degToRad(data.minAzimuthAngle);
controls.minPolarAngle = THREE.MathUtils.degToRad(data.minPolarAngle);
controls.minAzimuthAngle = THREE.MathUtils.degToRad(data.minAzimuthAngle);
controls.minZoom = data.minZoom;
controls.panSpeed = data.panSpeed;
controls.rotateSpeed = data.rotateSpeed;
Expand Down
2 changes: 1 addition & 1 deletion components/orbit-controls/dist/aframe-orbit-controls.min.js
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 2 additions & 3 deletions components/orbit-controls/examples/basic/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,12 @@
<meta charset="utf-8">
<title>A-Frame Orbit Controls Component - Basic</title>
<meta name="description" content="Basic example for A-Frame Orbit Controls component."></meta>
<script src="https://aframe.io/releases/0.8.2/aframe.min.js"></script>
<script src="https://aframe.io/releases/1.4.1/aframe.min.js"></script>
<script src="../../dist/aframe-orbit-controls.min.js"></script>
<script src="https://unpkg.com/[email protected]/dist/aframe-supercraft-loader.js"></script>
</head>
<body>
<a-scene>
<a-entity supercraft-loader="name: icky-snake"></a-entity>
<a-torus-knot color="#B84A39" arc="180" p="2" q="7" radius="5" radius-tubular="0.1"></a-torus-knot>
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Replaced the supercraft loader with a torus-knot. Supercraft loader no longer seems to work since aframe 1.1.0

<a-entity camera look-controls="enabled: false" orbit-controls="target: 0 1.6 -0.5; minDistance: 0.5; maxDistance: 180; initialPosition: 0 15 20"></a-entity>
</a-scene>

Expand Down
8 changes: 4 additions & 4 deletions components/orbit-controls/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,12 +110,12 @@ AFRAME.registerComponent('orbit-controls', {
controls.enableRotate = data.enableRotate;
controls.enableZoom = data.enableZoom;
controls.keyPanSpeed = data.keyPanSpeed;
controls.maxPolarAngle = THREE.Math.degToRad(data.maxPolarAngle);
controls.maxAzimuthAngle = THREE.Math.degToRad(data.maxAzimuthAngle);
controls.maxPolarAngle = THREE.MathUtils.degToRad(data.maxPolarAngle);
controls.maxAzimuthAngle = THREE.MathUtils.degToRad(data.maxAzimuthAngle);
controls.maxDistance = data.maxDistance;
controls.minDistance = data.minDistance;
controls.minPolarAngle = THREE.Math.degToRad(data.minPolarAngle);
controls.minAzimuthAngle = THREE.Math.degToRad(data.minAzimuthAngle);
controls.minPolarAngle = THREE.MathUtils.degToRad(data.minPolarAngle);
controls.minAzimuthAngle = THREE.MathUtils.degToRad(data.minAzimuthAngle);
controls.minZoom = data.minZoom;
controls.panSpeed = data.panSpeed;
controls.rotateSpeed = data.rotateSpeed;
Expand Down
2 changes: 1 addition & 1 deletion components/orbit-controls/lib/OrbitControls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ THREE.OrbitControls = function ( object, domElement ) {

// so camera.up is the orbit axis
var quat = new THREE.Quaternion().setFromUnitVectors( object.up, new THREE.Vector3( 0, 1, 0 ) );
var quatInverse = quat.clone().inverse();
var quatInverse = quat.clone().invert();

var lastPosition = new THREE.Vector3();
var lastQuaternion = new THREE.Quaternion();
Expand Down
2 changes: 1 addition & 1 deletion components/orbit-controls/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "aframe-orbit-controls",
"version": "1.3.0",
"version": "1.3.1",
"description": "Orbit controls for A-Frame.",
"main": "index.js",
"unpkg": "dist/aframe-orbit-controls.min.js",
Expand Down