Skip to content

[WIP] fix for rotation X bug #60

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

Merged
merged 33 commits into from
Apr 15, 2020
Merged

[WIP] fix for rotation X bug #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
e41099d
Add video stop on marker being lost
JamesBotterill Mar 16, 2020
66caf7a
fix bug in arMarkerControls with wrong rotation
kalwalt Mar 17, 2020
a94f8cc
revert the old artoolkit.min.js libs for testing
kalwalt Mar 17, 2020
d0a4acc
missing renderer
nicolocarpignoli Mar 17, 2020
4f68374
add rotation matrix X 90 deg to arMarkerControls-nft
kalwalt Mar 18, 2020
e5c7b21
changing old links in all examples
kalwalt Mar 18, 2020
c487d3c
Merge pull request #56 from JamesBotterill/dev
nicolocarpignoli Mar 20, 2020
c18346b
revert to old artooolkit.min.js
kalwalt Mar 20, 2020
4d943ef
fix: now minDistance works even if changed runtime
nicolocarpignoli Mar 20, 2020
a759d2c
Merge branch 'dev' of github.com:AR-js-org/AR.js into dev
nicolocarpignoli Mar 20, 2020
22d7852
Last commit before release
nicolocarpignoli Mar 23, 2020
cdf0e6a
removign debug logs
nicolocarpignoli Mar 23, 2020
8d164dc
built last modified
nicolocarpignoli Mar 23, 2020
0dc4dfc
clean components at remove
nicolocarpignoli Mar 23, 2020
7c81239
removing bind
nicolocarpignoli Mar 23, 2020
29d1a9e
trying to fix minDistance update
nicolocarpignoli Mar 23, 2020
1b9c3b8
update callbcak
nicolocarpignoli Mar 23, 2020
6eba99e
update
nicolocarpignoli Mar 23, 2020
b38cac8
update fix
nicolocarpignoli Mar 23, 2020
ed138d6
fix: minDistance always working, not it is used when updating gps cam…
nicolocarpignoli Mar 24, 2020
a3034e4
use latest aframe, not 0.9.2. it works
nicolocarpignoli Mar 25, 2020
da5ea83
3.0.2
nicolocarpignoli Mar 25, 2020
6f857d3
Version of gps-camera and gps-entity-place using Spherical Mercator p…
nickw1 Mar 28, 2020
450580b
Merge pull request #75 from nickw1/dev
nicolocarpignoli Apr 9, 2020
eec5527
clean
nicolocarpignoli Apr 9, 2020
8fc355b
rotating trex
kalwalt Apr 15, 2020
b5b79c1
fix bug in arMarkerControls with wrong rotation
kalwalt Mar 17, 2020
e2aed32
revert the old artoolkit.min.js libs for testing
kalwalt Mar 17, 2020
272fc70
add rotation matrix X 90 deg to arMarkerControls-nft
kalwalt Mar 18, 2020
8b461d9
changing old links in all examples
kalwalt Mar 18, 2020
41c578e
revert to old artooolkit.min.js
kalwalt Mar 20, 2020
9da8b3c
rotating trex
kalwalt Apr 15, 2020
73cbdef
Merge branch 'feature-artoolkit-new' of https://github.com/kalwalt/AR…
kalwalt Apr 15, 2020
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
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
# 3.0.2

- update documentation using latest aframe version on every example

# 3.0.1

- fixed `minDistance` property updating on location based
- enhanced Image tracking examples

# 3.0.0

- fix minor Readme paths/typos
Expand Down
5 changes: 2 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Please import the one you need for your project, not both:
You can also import a specific version replacing `master` keyword with version tag:

```html
<script src="https://raw.githack.com/AR-js-org/AR.js/3.0.0/aframe/build/aframe-ar-nft.js">
<script src="https://raw.githack.com/AR-js-org/AR.js/3.0.2/aframe/build/aframe-ar-nft.js">
```

## Get started
Expand Down Expand Up @@ -135,8 +135,7 @@ Please follow this simple steps:
<meta charset="utf-8" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<title>GeoAR.js demo</title>
<!-- with location based, use aframe v0.9.2 -->
<script src="https://aframe.io/releases/0.9.2/aframe.min.js"></script>
<script src="https://aframe.io/releases/1.0.4/aframe.min.js"></script>
<script src="https://unpkg.com/[email protected]/dist/aframe-look-at-component.min.js"></script>
<script src="https://raw.githack.com/AR-js-org/AR.js/master/aframe/build/aframe-ar-nft.js"></script>
</head>
Expand Down
648 changes: 612 additions & 36 deletions aframe/build/aframe-ar-nft.js
View file
Open in desktop

Large diffs are not rendered by default.

Loading