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

v3 Release: NFT + code cleaning + doc update and other improvements. #722

Closed
wants to merge 98 commits into from
Closed

v3 Release: NFT + code cleaning + doc update and other improvements. #722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
98 commits
Select commit Hold shift + click to select a range
4244ddf
testing the new jsartoolkit5 with NFT
kalwalt Dec 12, 2019
bfe01de
simple test fails at ArToolkitContext
kalwalt Dec 12, 2019
43789c3
added testing NFT example but camera error
kalwalt Dec 13, 2019
32ccbee
fix for an error in pinball path
kalwalt Dec 13, 2019
39dd279
cleaning stuff
nicolocarpignoli Dec 23, 2019
d7167ee
Merge commit '307264d13052e89515617574bd9a6edf0825f7c2' into testing-…
nicolocarpignoli Dec 23, 2019
63b1245
Merge commit '97107fa63a6fcb44a44e61a83005ac7d5fed3724' into testing-…
nicolocarpignoli Dec 24, 2019
a979aab
chore: removed aruco remaining references
nicolocarpignoli Dec 24, 2019
702cfaa
make minify works now
nicolocarpignoli Dec 24, 2019
4f6d1f5
artoolkit.api.js not needed, not multiply projectionMatrix
kalwalt Dec 24, 2019
55c10f8
not requested artoolkit.api.js and deleting last obsolete aruco import
kalwalt Dec 24, 2019
d4844f4
removing lean version of ar.js lib
kalwalt Dec 24, 2019
fdc0add
changes to avoid artoolkit.setup and importScripts issues
kalwalt Dec 25, 2019
8327ffb
Merge branch 'dev' of https://github.com/jeromeetienne/AR.js into tes…
kalwalt Dec 25, 2019
0c3ccf4
rebuilding the libraries
kalwalt Dec 25, 2019
8b0f543
starting to add nft into THREEx
kalwalt Dec 26, 2019
554290d
removing some examples and aruco references
nicolocarpignoli Jan 8, 2020
e163e90
removed remaining aruco/tango references and code
nicolocarpignoli Jan 8, 2020
11491cf
descriptorsUrl parmeter instead of patternUrl for nft
nicolocarpignoli Jan 8, 2020
64d0eea
amarkercontrols integrate with NFT
nicolocarpignoli Jan 8, 2020
09dbf28
wip
nicolocarpignoli Jan 8, 2020
f3441a0
on nft example, something is showing. to be enhanced
nicolocarpignoli Jan 8, 2020
0b316cb
adding getNFTmarker EventListener
kalwalt Jan 8, 2020
a5e5501
now a model is displayed onto a NFT marker
kalwalt Jan 8, 2020
7266f54
moved worker
nicolocarpignoli Jan 9, 2020
efa39c7
remove artoolkit.three.js for now, it was never used by ar.js
nicolocarpignoli Jan 9, 2020
8e99812
on nft.html include only ar.min.js that already includes everything n…
nicolocarpignoli Jan 9, 2020
91df417
indent
nicolocarpignoli Jan 9, 2020
000a372
wip
nicolocarpignoli Jan 9, 2020
89e881d
new jsartoolkit5 libs ref https://github.com/kalwalt/jsartoolkit5/pul…
kalwalt Jan 9, 2020
7672bf3
adapting the code to changes in the jsartoolkit5 library
kalwalt Jan 9, 2020
2b9d4fa
small changes
nicolocarpignoli Jan 17, 2020
ab81650
wip adding clean worker
nicolocarpignoli Jan 18, 2020
5d374f6
add some comments to clarify
nicolocarpignoli Jan 18, 2020
1e0c4c0
it load the NFT marker but without tracking it
kalwalt Jan 18, 2020
0b5c08b
now tracking and show something on desktop
nicolocarpignoli Jan 18, 2020
2be0da6
pushing aframe code side, with example. not tested
nicolocarpignoli Jan 18, 2020
5023832
removed unnecessary matrixes, just use .matrix
nicolocarpignoli Jan 19, 2020
3faba37
fix positioning on nft html
nicolocarpignoli Jan 19, 2020
e8ecd1e
now it works! to fix on mobile
nicolocarpignoli Jan 19, 2020
381933d
clean up
nicolocarpignoli Jan 19, 2020
c7c21ec
Merge commit 'b3e0a6b4657ee396c61c94f23f3d12b7a0bb5882' into clean-wo…
nicolocarpignoli Jan 19, 2020
b51b416
merged with dev
nicolocarpignoli Jan 20, 2020
a5d2700
deleting not necessary example and video resource
kalwalt Jan 20, 2020
dd0c31b
adding ratio and camera stuff
kalwalt Jan 20, 2020
0be4dc9
setCamera() and camera in MarkersControl. Data passing, model not sho…
kalwalt Jan 20, 2020
e964986
small fix add the root to the scene
kalwalt Jan 20, 2020
f776e26
video need to be fixed
kalwalt Jan 20, 2020
a146f13
wip, maybe _this.object3d is wrong, maybe have to use camera
nicolocarpignoli Jan 21, 2020
d93ad9c
this works also on mobile but only in landscape mode
kalwalt Jan 23, 2020
8e7d676
this works also with ModelViewMatrix and root object, only in landsca…
kalwalt Jan 23, 2020
079ba64
added back loader, changed renderer ratio and size on nft html
nicolocarpignoli Jan 23, 2020
4fb6dff
minor
nicolocarpignoli Jan 23, 2020
7aafdad
modified aframe side a bit
nicolocarpignoli Jan 25, 2020
990b60b
using camera_para,data
nicolocarpignoli Jan 25, 2020
53b07d7
wip, to fix paths for camera and worker on aframe
nicolocarpignoli Jan 25, 2020
cb3dbf8
tracking works on aframe, does not show content
nicolocarpignoli Jan 26, 2020
2ce7cae
added log to see when tracks
nicolocarpignoli Jan 26, 2020
7a49ae6
deleting rendundant process()
kalwalt Jan 26, 2020
0f8c5cd
rebuild libs
kalwalt Jan 26, 2020
afcc271
better performance removing this line
nicolocarpignoli Jan 26, 2020
7947ea2
removing not necessary processs() line
kalwalt Jan 28, 2020
1cdde33
using camera_para.dat
kalwalt Jan 28, 2020
c50aa1a
Merge branch 'v3-working' of github.com:kalwalt/AR.js into v3-working
nicolocarpignoli Feb 1, 2020
57c913f
wip path
nicolocarpignoli Feb 1, 2020
c82bbb6
example sphere is similar than jsartoolkit5 one
nicolocarpignoli Feb 1, 2020
709cdeb
cleaned a bit the nft.html. still working on desktop, not on mobile
nicolocarpignoli Feb 1, 2020
176f801
very minor, modifies only for debugging
nicolocarpignoli Feb 1, 2020
cb7814f
works on aframe desktop
nicolocarpignoli Feb 2, 2020
2c066b8
it fucking works!
nicolocarpignoli Feb 2, 2020
d7b312a
works even on aframe now
nicolocarpignoli Feb 2, 2020
176625f
Merge branch 'v3-working' into v3
nicolocarpignoli Feb 2, 2020
d420cca
rebuilding
nicolocarpignoli Feb 2, 2020
1b075fb
flamingo example for aframe
nicolocarpignoli Feb 3, 2020
ddbfbff
added renderer options on aframe example
nicolocarpignoli Feb 4, 2020
1455aa8
removing ar-lean.js and ar-lean.min.js
kalwalt Feb 9, 2020
e521639
added flamingo to three.js nft.html example, working good
nicolocarpignoli Feb 10, 2020
95f6e47
Merge commit 'f78d99a7a2b9f72630eac99bef09cf3480c0eb90' into v3
nicolocarpignoli Feb 21, 2020
6c5973d
fix for new cmera modifies
nicolocarpignoli Feb 21, 2020
fd186c9
trying using thorsten modifies
nicolocarpignoli Feb 21, 2020
9e6e8b8
fix in the flamingo path
kalwalt Feb 21, 2020
842270b
works with higher resolution, but sometimes fails array buffer memory
nicolocarpignoli Feb 24, 2020
d1d5123
Merge branch 'trying-thorsten' into v3
nicolocarpignoli Feb 24, 2020
2fa9fb0
fixed buffer array, using 64MB in artoolkit min lib
nicolocarpignoli Feb 24, 2020
d28a582
new example with video
nicolocarpignoli Feb 24, 2020
14d5bc6
minor
nicolocarpignoli Feb 24, 2020
325e1a8
bugfix
nicolocarpignoli Feb 24, 2020
3927771
added animated model
nicolocarpignoli Feb 24, 2020
41b2597
clean stuff
nicolocarpignoli Feb 24, 2020
05dd215
debugUIEnabled false by default
nicolocarpignoli Feb 24, 2020
3f1f6db
going back to getUserMedia constraints, now tracking of marker is sta…
nicolocarpignoli Feb 26, 2020
451687f
fullscreen mode example
kalwalt Feb 26, 2020
715fcfc
fix for default-thinner-border.html example
kalwalt Feb 26, 2020
9bcd9a6
minor
nicolocarpignoli Feb 26, 2020
63b063c
Merge branch 'v3' of github.com:kalwalt/AR.js into v3
nicolocarpignoli Feb 26, 2020
ed7055c
refactor using two different libraries, one as current, one with nft
nicolocarpignoli Feb 26, 2020
baa019c
swap min versions and added old api
kalwalt Feb 26, 2020
c9fc49c
conversion to ar-nft almost done
kalwalt Feb 26, 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
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
watch: build
fswatch -0 three.js/src/*/*.js aframe/src/*.js babylon.js/src/*.js | xargs -0 -n 1 -I {} make build

prepare:
npm install

Expand Down
24 changes: 19 additions & 5 deletions aframe/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,29 @@
UGLIFY=../node_modules/.bin/uglifyjs
watch: build
fswatch -0 src/*.js ../three.js/src/*/*.js | xargs -0 -n 1 -I {} make build

.PHONY: build
build:
(cd ../three.js/ && make build)
cat ../three.js/build/ar.js \
src/component-*.js \
src/component-anchor.js \
src/component-hit-testing.js \
src/location-based/*.js \
src/system-arjs.js \
> build/aframe-ar.js
build-nft:
(cd ../three.js/ && make build)
cat ../three.js/build/ar-nft.js \
src/component-anchor-nft.js \
src/component-hit-testing.js \
src/location-based/*.js \
src/system-arjs*.js \
> build/aframe-ar.js
src/system-arjs.js \
> build/aframe-ar-nft.js

minify: build
minify-default: build
$(UGLIFY) build/aframe-ar.js > build/aframe-ar.min.js

minify-nft: build-nft
$(UGLIFY) build/aframe-ar-nft.js > build/aframe-ar-nft.min.js

minify: minify-default minify-nft
4,757 changes: 4,757 additions & 0 deletions aframe/build/aframe-ar-nft.js
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions aframe/build/aframe-ar-nft.min.js
View file
Open in desktop

Large diffs are not rendered by default.

Loading