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.

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

Webpack Build for AR.js (follow-up) #116

Merged
merged 177 commits into from
Nov 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
177 commits
Select commit Hold shift + click to select a range
5c8c643
relative imports for threex sources, split of ar sources in sep. files
MikiDi Apr 4, 2020
5ea4ec8
Make threex methods aliases of arjs ones
MikiDi Apr 5, 2020
1d638d0
Make threex alias of arjs one
MikiDi Apr 5, 2020
5bbf37e
Relative imports for markers-area, split of threex files in to aliases
MikiDi Apr 5, 2020
12e5e8c
Relative imports for new-api
MikiDi Apr 5, 2020
c1b8c88
utils import + todo's
MikiDi Apr 5, 2020
db3b36b
added todo's for toolkit api imports
MikiDi Apr 5, 2020
0aaad00
Relative imports + TODO's for aframe components
MikiDi Apr 5, 2020
a35d88f
added necessary dependencies to package.json
MikiDi Apr 5, 2020
2407434
Made markercontrols-nft in to 1 file with dependencies
MikiDi Apr 7, 2020
c48e8a5
artoolkit imports
MikiDi Apr 7, 2020
04c9c37
Import order
MikiDi Apr 7, 2020
4889b4c
Entrypoints
MikiDi Apr 7, 2020
19c1907
Temporarily fix usage of global context imports for non nft build
MikiDi Apr 7, 2020
f4a8b5c
Renamed (typo) file
MikiDi Apr 7, 2020
8368625
Initial webpack config + entrypoint
MikiDi Apr 7, 2020
59f88cb
Fixed import paths
MikiDi Apr 7, 2020
d2d1daa
Make another threex an alias of markercontrols
MikiDi Apr 8, 2020
b3d474b
removed resolved todos
MikiDi Apr 8, 2020
997da1d
Change order of imports
MikiDi Apr 8, 2020
2537375
Adapt to using ES6 jsartoolkit by @andypotato
MikiDi Apr 16, 2020
5c3c901
improved build config, separate dev build for source maps
MikiDi Apr 16, 2020
191ab9d
Fixed some imports
MikiDi Apr 16, 2020
1dd0eaa
Original import order
MikiDi Apr 16, 2020
39700ff
Minor clarifications while debugging
MikiDi Apr 16, 2020
7f47f26
Fix webpack env config
MikiDi Apr 19, 2020
0a69d36
Latest dev build
MikiDi Apr 19, 2020
c52d16b
Debugging help comment
MikiDi Apr 26, 2020
1bf73f2
Entrypoint for nft build
MikiDi Apr 26, 2020
ff3a1fd
Extra projection no longer necessary after changes in jsartoolkit
MikiDi Apr 26, 2020
d190d2a
Sync build
MikiDi Apr 26, 2020
756095e
Merge branch 'dev' into ES6
MikiDi Apr 26, 2020
83e030d
Configure nft-build
MikiDi May 17, 2020
14d7235
Configure alias for conditional nft importing
MikiDi May 17, 2020
e1ce9a9
Configure for new artoolkit5 library
MikiDi May 17, 2020
41b37d5
Fix definitions
MikiDi May 17, 2020
05fc900
Split webworker into separate file + configure build
MikiDi May 17, 2020
a66ec1f
Temporarily use custom artoolkit build
MikiDi May 17, 2020
5883c1f
build commands
MikiDi May 17, 2020
561a18c
build
MikiDi May 21, 2020
45a3cff
upgrading packages, rebuilding libs
kalwalt Feb 10, 2021
e6f55b5
Add a comment regarding the alias used for dynamic importing
MikiDi Feb 14, 2021
e1fcb86
Add index files for exporting THREEx & ARjs API
MikiDi Mar 20, 2021
4ee5478
fix typos in imports
MikiDi Mar 20, 2021
3ef5f36
Rename aframe nft-build for clarity
MikiDi Mar 20, 2021
7f7a7f8
always specify build mode for new webpack version
MikiDi Mar 20, 2021
97c5b56
remove threex-armarkercontrols alias & references
MikiDi Mar 20, 2021
8c9fc2c
remove threex-artoolkit alias & references
MikiDi Mar 20, 2021
834a299
CommonJS exports
MikiDi Mar 20, 2021
003800c
Adapt default example to new build path
MikiDi Mar 20, 2021
7e2bb96
Sync builds
MikiDi Mar 20, 2021
7b00ad1
fix for wrong entry in webpack.config.js
kalwalt Mar 20, 2021
9be14ec
remove threex-armultimarkercontrols alias & references
MikiDi Mar 21, 2021
61103f2
remove threex-markersarealearning alias & references
MikiDi Mar 21, 2021
7555e75
add missing export of ArMultiMarkerUtils
MikiDi Mar 21, 2021
60f92cc
remove threex-armultimarkerutils alias & references
MikiDi Mar 21, 2021
1d3032c
Sync builds
MikiDi Mar 21, 2021
190c3e6
deleting old Makefiles and jsartoolkit5 libs
kalwalt Mar 28, 2021
8ffcff5
worker inlined with inline option
kalwalt Mar 30, 2021
3a29ac5
missed matrix makeRotationX in arjs-markercontrols
kalwalt Mar 30, 2021
c7d7875
adding location-based code from PR #78
kalwalt Mar 30, 2021
595a5c1
arjs-nft-loaded Event from PR #98
kalwalt Mar 30, 2021
de5e38a
changes from 3.2.0 version
kalwalt Mar 30, 2021
6ee8c32
syncing with changes from 3.2.1 version
kalwalt Mar 31, 2021
dda88e0
syncing with 3.3.0
kalwalt Mar 31, 2021
367104d
fix for location-only build
kalwalt Mar 31, 2021
e9b530d
include all location-based code in aframe/build
kalwalt Mar 31, 2021
76471a8
ArjsDeviceOrientationControls need to be declared
kalwalt Mar 31, 2021
2302caf
syncing with 3.3.1 version
kalwalt Mar 31, 2021
3deb212
syncing with PR #180
kalwalt Mar 31, 2021
481bdb2
changes based on #225
kalwalt Mar 31, 2021
3c55f55
inclusion path changed in the examples
kalwalt Mar 31, 2021
5ee282f
upgrading packages
kalwalt Mar 31, 2021
d33dc7b
restoring artoolkit5-js version
kalwalt Apr 1, 2021
4c7a1f8
dev builds for solving the nft issue
kalwalt Apr 2, 2021
7920fba
fixing NFT issue (cfPatt error and not tracking)
kalwalt Apr 3, 2021
b7c48e0
missed minConfidence from #134
kalwalt Apr 3, 2021
2dae66d
gps-camera and gps-projected-camera: fix undeclared variable bug
nickw1 Apr 6, 2021
c6e0a42
Export ArjsDeviceOrientationControls from module
nickw1 Apr 8, 2021
53fd5e6
improving aframe nft examples
kalwalt Apr 11, 2021
ae39c21
different externals for every build
kalwalt Apr 11, 2021
c335c38
using artoolkit5-js from AR-js-org
kalwalt Apr 19, 2021
cac9611
fix for position and rotation in basic aframe example
kalwalt Apr 19, 2021
db72549
removing cors paths
kalwalt Apr 19, 2021
ebd85fb
new builds with @ar-js-org/artoolkit5-js package
kalwalt Apr 20, 2021
d2748c2
removing proxy from Readme.md
kalwalt Apr 20, 2021
283cc06
fix issue with canvas and tainted data
kalwalt Apr 21, 2021
775b490
Updated location-based examples
nickw1 Apr 23, 2021
bbae72b
formatting issue
nickw1 Apr 24, 2021
08a1da7
Fix location-based examples
nickw1 Apr 30, 2021
ebd50e9
remove redundant file
nickw1 Apr 30, 2021
c33222b
improve peakfinder-2d example with cone objects
nickw1 May 1, 2021
79c6360
add explanatory comment
nickw1 May 1, 2021
382ccaa
formatting, OSM credit
nickw1 May 1, 2021
2973d5c
removing not necessary msg log
kalwalt May 1, 2021
ecc992c
upgrading three.js to 0.127.0 version
kalwalt May 1, 2021
8512bf9
removing getInverse() because is deprecated
kalwalt May 10, 2021
ed52675
testing modified version of artoolkit5-js
kalwalt May 11, 2021
53b7975
minimal_ES6 example for testing
kalwalt May 11, 2021
d415861
added index.css for correct styling
kalwalt May 11, 2021
84e640e
fix bug in removeMarker
kalwalt May 11, 2021
7eb6ce3
disposing resources
kalwalt May 11, 2021
4128f2d
initial minimal_ES6 aframe example
kalwalt May 11, 2021
27795ea
add dispose() method to ARjs.Source
hatsumatsu May 15, 2021
9537de8
add dispose() method to ARjs.Context
hatsumatsu May 15, 2021
38e92cc
add builds
hatsumatsu May 15, 2021
f8f5a11
debug...
hatsumatsu May 15, 2021
4de7d07
debug...
hatsumatsu May 15, 2021
94cd46b
fix bug in ARjs.Context.removeMarker()
hatsumatsu May 15, 2021
693e820
add builds
hatsumatsu May 15, 2021
0aa7cb6
fix bug in ARjs.Context.removeMarker()
hatsumatsu May 15, 2021
1bfe90c
fix bug in ARjs.Context.removeMarker()
hatsumatsu May 15, 2021
10a636d
debug...
hatsumatsu May 15, 2021
2005773
removed debug logs
hatsumatsu May 15, 2021
bb05aef
fixed bug in dispose()
hatsumatsu May 15, 2021
7cde552
formatting
hatsumatsu May 15, 2021
2c4aa5c
formatting
hatsumatsu May 15, 2021
9a43867
add dispose() method to ARjs.Source
hatsumatsu May 15, 2021
fa9d063
add dispose() method to ARjs.Context
hatsumatsu May 15, 2021
4ae52b0
add builds
hatsumatsu May 15, 2021
8d10a9d
debug...
hatsumatsu May 15, 2021
0126ea8
debug...
hatsumatsu May 15, 2021
2d2d0ed
fix bug in ARjs.Context.removeMarker()
hatsumatsu May 15, 2021
b36f1fa
add builds
hatsumatsu May 15, 2021
f4a5951
fix bug in ARjs.Context.removeMarker()
hatsumatsu May 15, 2021
42e7300
fix bug in ARjs.Context.removeMarker()
hatsumatsu May 15, 2021
132a44c
debug...
hatsumatsu May 15, 2021
a96c2f9
removed debug logs
hatsumatsu May 15, 2021
b92297e
fixed bug in dispose()
hatsumatsu May 15, 2021
e53f51e
formatting
hatsumatsu May 15, 2021
90e83dc
formatting
hatsumatsu May 15, 2021
ceb5f4b
dispose event handlers created in ARSource
hatsumatsu May 20, 2021
1294cde
dispose event handlers created in ARSource
hatsumatsu May 20, 2021
bf48bf5
clean up class properties when disposing instances
hatsumatsu May 26, 2021
4bcf7b3
added missing build
hatsumatsu May 26, 2021
94ed03b
add check for domElement
hatsumatsu May 26, 2021
27b8fa8
attempt to properly dispose ARMarkerControls
hatsumatsu May 26, 2021
ba1140c
...
hatsumatsu May 26, 2021
f636428
...
hatsumatsu May 26, 2021
1cdefee
...
hatsumatsu May 26, 2021
9aeac6c
...
hatsumatsu May 26, 2021
6839f72
...
hatsumatsu May 26, 2021
e24c965
...
hatsumatsu May 26, 2021
4876a4e
add dispose method to ARMarkerControls
hatsumatsu May 26, 2021
c87ed97
remove .load() from video source
hatsumatsu May 26, 2021
915efde
attempt to free memory
hatsumatsu May 27, 2021
e47b809
revert some changes that were introduced for debugging
hatsumatsu Jun 4, 2021
f2692d0
Merge remote-tracking branch 'upstream/ES6' into ES6--dispose-methods
hatsumatsu Jun 15, 2021
d05d4a9
build files
hatsumatsu Jun 15, 2021
c73e90d
Merge pull request #283 from hatsumatsu/ES6--dispose-methods
kalwalt Oct 11, 2021
f0a045e
dispose the ARcontext with a button
kalwalt Nov 3, 2021
7771824
scoped name for the npm pckg
kalwalt Nov 4, 2021
bc080c0
new dist builds (dev)
kalwalt Nov 5, 2021
9f3910d
es beta version of the package
kalwalt Nov 5, 2021
18c255e
upgrade three.js to 0.132.2
kalwalt Nov 12, 2021
6c8a4c7
production build
kalwalt Nov 12, 2021
c6cb165
changes based on commit d1e98d384d7a24eb95505e675d3770d61a016dd7
kalwalt Nov 12, 2021
e8f350c
changes based on commit a91f690858c8907f562684d0486145b4488456f5
kalwalt Nov 12, 2021
444983b
rebuilding libs after location based changes
kalwalt Nov 12, 2021
1039250
changes based on commit f5efd21215a796a2e32b919259e4f5ce839e4b29
kalwalt Nov 12, 2021
45cb79a
fix for video PR #235 from @stevenlybeck
kalwalt Nov 12, 2021
9f28219
removing proxy
kalwalt Nov 12, 2021
7c20234
fix for path in nft image-tracking example
kalwalt Nov 12, 2021
387bb46
3.3.2 version summary in the CHANGELOG file
kalwalt Nov 12, 2021
7e8ace0
version 3.3.2-es6-beta-01
kalwalt Nov 12, 2021
2beb20b
exclude files from npm package
kalwalt Nov 12, 2021
019e9e7
changes in gps-camer
kalwalt Nov 12, 2021
e1469fb
fix for gps-projected-camera
kalwalt Nov 12, 2021
d998a44
changes in location-based
kalwalt Nov 12, 2021
5adb768
fix for localPosition issue
kalwalt Nov 14, 2021
52004a0
fix for CustomEvent
kalwalt Nov 14, 2021
57928db
code aligned to 3.3.3 version
kalwalt Nov 14, 2021
7e6c277
removing alert changes from PR #270
kalwalt Nov 14, 2021
76cd120
changes from commit Allow user-specified element, or alerts, for errors
kalwalt Nov 14, 2021
d8c0c6e
changes from #304
kalwalt Nov 14, 2021
036cef7
server command
kalwalt Nov 14, 2021
9df0e1d
Merge branch 'dev' into ES6
kalwalt Nov 16, 2021
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: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,5 @@
.atom-live-server.json
node_modules/*
package-lock.json
aframe/build/*.txt
three.js/build/*.txt
8 changes: 8 additions & 0 deletions .npmignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
aframe/examples/**/**/*
aframe/examples/**/*
aframe/examples/*
three.js/examples/**/**/*
three.js/examples/**/*
three.js/examples/*
test/**/*
test/*
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
- Deactivated GPS listener when AR.js app not in the foreground (thanks to @NVFedorov for raising this issue)

- update license wording (thanks to @chingucoding)

# 3.3.1

- Fix minor location-based bugs
Expand Down
16 changes: 0 additions & 16 deletions Makefile

This file was deleted.

11 changes: 11 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,10 @@ Please follow this simple steps:
</body>
</html>
```
Important! Be aware that if you are referring to external resources, in any app, especially those using NFT, you will encounter CORS problems if those resources are not in the same server of the code. If you can’t see the tracking, please open your Browser Dev Tools and check if you have CORS errors in the console. If so, you have to fix those errors in order to see your content. The correct fix is to place your resources on the same server of your code.

If you cannot do that, you can host a proxy anywhere server to solve that (https://github.com/Rob--W/cors-anywhere).
Please note that several hosting services have policies that does not permit to use such server. Always check hosting services policies before using them to avoid account suspensions

Important! Be aware that if you are referring to external resources, in any app, especially those using NFT, you will encounter CORS problems if those resources are not in the same server of the code. If you can’t see the tracking, please open your Browser Dev Tools and check if you have CORS errors in the console. If so, you have to fix those errors in order to see your content. The correct fix is to place your resources on the same server of your code.

Expand All @@ -205,6 +209,13 @@ Please note that several hosting services have policies that does not permit to

Learn more on the [AR.js Official Documentation](https://ar-js-org.github.io/AR.js-Docs/).

## Experimental ES6 npm package

Even if not yet in the master branch, you can install **AR.js** with NPM:

```
npm install @ar-js-org/ar.js
```
## Troubleshooting, feature requests, community

**You can find a lot of help on the old [AR.js repositories issues](https://github.com/jeromeetienne/AR.js/issues). Please search on open/closed issues, you may find interesting stuff.**
Expand Down
27 changes: 0 additions & 27 deletions aframe/Makefile

This file was deleted.

Loading