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

v3 Release: NFT + code cleaning + doc update #705

Closed
wants to merge 73 commits into from
Closed

v3 Release: NFT + code cleaning + doc update #705

wants to merge 73 commits into from

Conversation

kalwalt
Copy link
Contributor

@kalwalt kalwalt commented Jan 20, 2020 •
edited by nicolocarpignoli
Loading

⚠️ All PRs have to be done versus 'dev' branch, so be aware of that, or we'll close your issue ⚠️
From #674 (comment) #674
What kind of change does this PR introduce?
This PR want to test the new jsartoolkit5 from kalwalt/jsartoolkit5#1 with the new changes especially the NFT part.

🖼 This will eventually make AR.js capable of detect and track 2D images.

https://twitter.com/nicolocarp/status/1204841439160684549

Could be raise some bugs and incompatibilties between the code. It is more a test...
Can it be referenced to an Issue? If so what is the issue # ?

From jsartoolkit5 repo: PR kalwalt/jsartoolkit5#1
From AR.js issues:

also, a repo cleaning will help for: #433

How can we test it?
Just test the examples and tell us what happens...

Summary

Does this PR introduce a breaking change?
Nope, it will remove old code, but unnecessary. It will add NFT feature.

Please TEST your PR before proposing it. Specify here what device you have used for tests, version of OS and version of Browser

Other information
I uploaded the new jsartookit5 libs and build the AR.js libs with makefile.

Progress

  • Clean repo before starting the porting
  • Import new jsartoolkit5 version, coming with NFT
  • Adapt the code (threejs side) to support NFT (emulate what's already done for fiducial markers)
  • Fix the rendering of content on AR.js side, for NFT (onMarkerFound function)
  • Make it work on mobile
  • Enhance resolution in both mobile and desktop
  • Check if animations work with NFT. If not, or rendering rate is too high, use interpolation
  • Fix broken pattern marker (content appears shifted after NFT modifies, or maybe even before during the cleaning of the repo)
  • Remove all rendering code on the Worker
  • Adapt the code (aframe side) to support NFT (emulate what's already done for fiducial markers)
  • Create at least one example for threejs + NFT
  • Create at least one example for aframe + NFT
  • Cable the change of position of the 3D object (x = 100, y = 100) inside the core, so we don't have to replicate it in every example (both aframe/three.js)
  • Change documentation (principal Readme, also with NFT Marker generator + Readmes inside threejs + aframe folders)
  • release version 3 of AR.js

kalwalt and others added 30 commits December 12, 2019 19:10
@kalwalt
testing the new jsartoolkit5 with NFT
4244ddf
@kalwalt
simple test fails at ArToolkitContext
bfe01de
@kalwalt
added testing NFT example but camera error
43789c3
@kalwalt
fix for an error in pinball path
32ccbee
@nicolocarpignoli
cleaning stuff
39dd279
@nicolocarpignoli
Merge commit '307264d13052e89515617574bd9a6edf0825f7c2' into testing-…
d7167ee 
…jsartoolkit5-NFT

# Conflicts:
#	three.js/examples/test-runner.html
@nicolocarpignoli
Merge commit '97107fa63a6fcb44a44e61a83005ac7d5fed3724' into testing-…
63b1245 
…jsartoolkit5-NFT

# Conflicts:
#	three.js/experiments/deadreckoning.html
@nicolocarpignoli
chore: removed aruco remaining references
a979aab
@nicolocarpignoli
make minify works now
702cfaa
@kalwalt
artoolkit.api.js not needed, not multiply projectionMatrix
4f6d1f5
@kalwalt
not requested artoolkit.api.js and deleting last obsolete aruco import
55c10f8
@kalwalt
removing lean version of ar.js lib
d4844f4
@kalwalt
changes to avoid artoolkit.setup and importScripts issues
fdc0add
@kalwalt
Merge branch 'dev' of https://github.com/jeromeetienne/AR.js into tes…
8327ffb 
…ting-jsartoolkit5-NFT
@kalwalt
rebuilding the libraries
0c3ccf4
@kalwalt
starting to add nft into THREEx
8b0f543
@nicolocarpignoli
removing some examples and aruco references
554290d
@nicolocarpignoli
removed remaining aruco/tango references and code
e163e90
@nicolocarpignoli
descriptorsUrl parmeter instead of patternUrl for nft
11491cf
@nicolocarpignoli
amarkercontrols integrate with NFT
64d0eea
@nicolocarpignoli
wip
09dbf28
@nicolocarpignoli
on nft example, something is showing. to be enhanced
f3441a0
@kalwalt
adding getNFTmarker EventListener
0b316cb
@kalwalt
now a model is displayed onto a NFT marker
a5e5501
@nicolocarpignoli
moved worker
7266f54
@nicolocarpignoli
remove artoolkit.three.js for now, it was never used by ar.js
efa39c7
@nicolocarpignoli
on nft.html include only ar.min.js that already includes everything n…
8e99812 
…eeded
@nicolocarpignoli
indent
91df417
@nicolocarpignoli
wip
000a372
@kalwalt
new jsartoolkit5 libs ref kalwalt/jsartoolkit5@4a2fd7b
89e881d
@Marcus5234
Copy link

Any ETA on this? When do you guys think image tracking will be available in arjs?

@kalwalt
Copy link
Contributor Author

kalwalt commented Jan 29, 2020

Any ETA on this? When do you guys think image tracking will be available in arjs?

Very difficult to say, but me and @nicolocarpignoli are very motivated that this happens. actually we have an issue testing on smartphone device: while on landscape mode it detect and track the NFT marker, instead in portrait mode this not happens. Probably an iusse with ratio or related thing, but hard to sort out for the Ar.js complexity. Anyway we hope to solve this soon !! 😄 🎉

@nicolocarpignoli
Copy link
Collaborator

If anyone is will to help is very welcome, to speed up the process

@nicolocarpignoli
Merge branch 'v3-working' of github.com:kalwalt/AR.js into v3-working
c50aa1a
@nicolocarpignoli
wip path
57c913f
@nicolocarpignoli
example sphere is similar than jsartoolkit5 one
c82bbb6
@nicolocarpignoli
cleaned a bit the nft.html. still working on desktop, not on mobile
709cdeb
@nicolocarpignoli
very minor, modifies only for debugging
176f801
@nicolocarpignoli
works on aframe desktop
cb7814f
@nicolocarpignoli
it fucking works!
2c066b8
@nicolocarpignoli
works even on aframe now
d7b312a
@nicolocarpignoli
Merge branch 'v3-working' into v3
176625f 
# Conflicts:
#	aframe/build/aframe-ar.js
#	aframe/build/aframe-ar.min.js
#	three.js/build/ar.js
#	three.js/build/ar.lean.js
#	three.js/build/ar.lean.min.js
#	three.js/build/ar.min.js
#	three.js/examples/nft.html
#	three.js/src/threex/threex-armarkercontrols.js
#	three.js/vendor/jsartoolkit5/js/artoolkit.worker.js
@nicolocarpignoli
rebuilding
d420cca
@nicolocarpignoli
Copy link
Collaborator

It now works on aframe side and three.js side (after mergin v3-working branch).
Updated the checklist.
Work in progress 💪🏻

@kalwalt
Copy link
Contributor Author

kalwalt commented Feb 2, 2020

That's a great Progress indeed, let's improve it now!

@nicolocarpignoli
Copy link
Collaborator

Can you please re-open this PR on the new dev branch? thank you

@nicolocarpignoli
Copy link
Collaborator

sorry had to clean the dev branch

@kalwalt kalwalt mentioned this pull request Feb 4, 2020
Closed
14 tasks
@kalwalt kalwalt mentioned this pull request Feb 13, 2020
Closed
@kalwalt kalwalt mentioned this pull request Feb 28, 2020
Closed
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nicolocarpignoli nicolocarpignoli nicolocarpignoli left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@kalwalt @nicolocarpignoli @Carnaux @Marcus5234