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

WIP: using two libraries (NFT / default) #740

Closed
wants to merge 101 commits into from
Closed

WIP: using two libraries (NFT / default) #740

wants to merge 101 commits into from

Conversation

nicolocarpignoli
Copy link
Collaborator

No description provided.

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
nicolocarpignoli and others added 21 commits February 10, 2020 22:11
@nicolocarpignoli
added flamingo to three.js nft.html example, working good
e521639
@nicolocarpignoli
Merge commit 'f78d99a7a2b9f72630eac99bef09cf3480c0eb90' into v3
95f6e47 
# Conflicts:
#	aframe/build/aframe-ar.js
#	aframe/build/aframe-ar.min.js
#	package-lock.json
#	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/src/threex/threex-artoolkitprofile.js
@nicolocarpignoli
fix for new cmera modifies
6c5973d
@nicolocarpignoli
trying using thorsten modifies
fd186c9
@kalwalt
fix in the flamingo path
9e6e8b8
@nicolocarpignoli
works with higher resolution, but sometimes fails array buffer memory
842270b
@nicolocarpignoli
Merge branch 'trying-thorsten' into v3
d1d5123
@nicolocarpignoli
fixed buffer array, using 64MB in artoolkit min lib
2fa9fb0
@nicolocarpignoli
new example with video
d28a582
@nicolocarpignoli
minor
14d5bc6
@nicolocarpignoli
bugfix
325e1a8
@nicolocarpignoli
added animated model
3927771
@nicolocarpignoli
clean stuff
41b2597
@nicolocarpignoli
debugUIEnabled false by default
05dd215
@nicolocarpignoli
going back to getUserMedia constraints, now tracking of marker is sta…
3f1f6db 
…ble again, but still content not in right position
@kalwalt
fullscreen mode example
451687f
@kalwalt
fix for default-thinner-border.html example
715fcfc
@nicolocarpignoli
minor
9bcd9a6
@nicolocarpignoli
Merge branch 'v3' of github.com:kalwalt/AR.js into v3
63b063c
@nicolocarpignoli
try using two libs
c347ae3
@nicolocarpignoli
minor
b74f0cf
@nicolocarpignoli
Copy link
Collaborator Author

@kalwalt I created this to easily see modification of 'NON-nft' files. They seems reasonable modifies to me.

Let me know. Maybe the problem is not in the artoolkit.min.js sources but on those modifies, at this point.

@kalwalt kalwalt mentioned this pull request Feb 27, 2020
Closed
13 tasks
@nicolocarpignoli
Copy link
Collaborator Author

closing, principal one is #742

@nicolocarpignoli nicolocarpignoli mentioned this pull request Feb 29, 2020
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nicolocarpignoli @kalwalt