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

Fixing nft #1

Closed
wants to merge 314 commits into from
Closed

Fixing nft #1

wants to merge 314 commits into from
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Jan 11, 2018

  1. update tests to measure markerDetect

    @ThorstenBux
    ThorstenBux committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    6b1a7fa View commit details
    Browse the repository at this point in the history

  2. updated luma calculation

    @ThorstenBux
    ThorstenBux committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    60d6396 View commit details
    Browse the repository at this point in the history

  3. Video luma optimization and test fixing

    @ThorstenBux
    ThorstenBux committed Jan 11, 2018
    Configuration menu
    Copy the full SHA
    d76b8a6 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2018

  1. Changes to the threejs_from_scratch example and the underlying API to… 

    … make the example work again
    @ThorstenBux
    ThorstenBux committed Jan 14, 2018
    Configuration menu
    Copy the full SHA
    0d25070 View commit details
    Browse the repository at this point in the history

  2. Updated all examples to work with the underlying ARToolKit API changes

    @ThorstenBux
    ThorstenBux committed Jan 14, 2018
    Configuration menu
    Copy the full SHA
    5f458cc View commit details
    Browse the repository at this point in the history

  3. Changed pre-recorded video to .mp4 to support all browsers incl. Safa… 

    …ri, as .ogg was not supported by Safari
    @ThorstenBux
    ThorstenBux committed Jan 14, 2018
    Configuration menu
    Copy the full SHA
    56dec36 View commit details
    Browse the repository at this point in the history

Commits on Jan 15, 2018

  1. support for iOS 11 video in Safari

    @ThorstenBux
    ThorstenBux committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    17f489e View commit details
    Browse the repository at this point in the history

  2. Test remarks

    @ThorstenBux
    ThorstenBux committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    dabea7d View commit details
    Browse the repository at this point in the history

  3. Merge pull request #59 from artoolkitx/artk-update 

    Artk update
    @ThorstenBux
    ThorstenBux committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    ea62d07 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #52 from nylki/patch-2 

    Patch 2
    @ThorstenBux
    ThorstenBux committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    a009011 View commit details
    Browse the repository at this point in the history

  5. WIP: Type definitions 

    Merge branch 'typescript' into ts-fromCommunity

* typescript:
  threejs integration
  fix getMarker return type
  ARMarkerInfo class
  update  type defs
  update versıon and publish
  export necessary modules for typescript
  type defs for artoolkit.api

# Conflicts:
#	build/artoolkit.debug.js
    @ThorstenBux
    ThorstenBux committed Jan 15, 2018
    Configuration menu
    Copy the full SHA
    afd2765 View commit details
    Browse the repository at this point in the history

Commits on Jan 21, 2018

  1. WIP: Type definitions 

    Merge branch 'typescript' into ts-fromCommunity

* typescript:
  threejs integration
  fix getMarker return type
  ARMarkerInfo class
  update  type defs
  update versıon and publish
  export necessary modules for typescript
  type defs for artoolkit.api

# Conflicts:
#	build/artoolkit.debug.js
    @ThorstenBux
    ThorstenBux committed Jan 21, 2018
    Configuration menu
    Copy the full SHA
    761228d View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2018

  1. Merge pull request #60 from ThorstenBux/ts-fromCommunity 

    Ts from community
    @ThorstenBux
    ThorstenBux committed Jan 22, 2018
    Configuration menu
    Copy the full SHA
    62d43ca View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2018

  1. add setDefaultMarkerWidth

    @ThorstenBux
    ThorstenBux committed Jan 29, 2018
    Configuration menu
    Copy the full SHA
    ea819f1 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #64 from ThorstenBux/ts-fromCommunity 

    add setDefaultMarkerWidth
    @ThorstenBux
    ThorstenBux committed Jan 29, 2018
    Configuration menu
    Copy the full SHA
    075c496 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2018

  1. Fixed type definitions

    @ThorstenBux
    ThorstenBux committed Feb 4, 2018
    Configuration menu
    Copy the full SHA
    c88a144 View commit details
    Browse the repository at this point in the history

  2. Added tests and fixed error with registering empty string as marker

    @ThorstenBux
    ThorstenBux committed Feb 4, 2018
    Configuration menu
    Copy the full SHA
    c9da9f3 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #66 from artoolkitx/trackable-registration-bug 

    Trackable registration bug
    @ThorstenBux
    ThorstenBux committed Feb 4, 2018
    Configuration menu
    Copy the full SHA
    a832f82 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2018

  1. Updated recommended version of the emscripten image to compile with D… 

    …ocker
    @ThorstenBux
    ThorstenBux committed May 14, 2018
    Configuration menu
    Copy the full SHA
    8f1afc5 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2018

  1. prevent WASM build and fix ARCameraParam constructor error.

    @ThorstenBux
    ThorstenBux committed Jul 4, 2018
    Configuration menu
    Copy the full SHA
    a00c8ac View commit details
    Browse the repository at this point in the history

  2. Fixed tests to run with the .min.js file 

    Fixed issue with artoolkit.setup not a function
Fixed runtime error

Commit new compiled files
    @ThorstenBux
    ThorstenBux committed Jul 4, 2018
    Configuration menu
    Copy the full SHA
    0310e0f View commit details
    Browse the repository at this point in the history

  3. Working example with wasm support

    @ThorstenBux
    ThorstenBux committed Jul 4, 2018
    Configuration menu
    Copy the full SHA
    4229ff6 View commit details
    Browse the repository at this point in the history

  4. making it async again

    @ThorstenBux
    ThorstenBux committed Jul 4, 2018
    Configuration menu
    Copy the full SHA
    4f4c954 View commit details
    Browse the repository at this point in the history

  5. Added wasm loading into jsartoolkit5 API 

    Added tests for wasm support
Documented how wasm can be used
    @ThorstenBux
    ThorstenBux committed Jul 4, 2018
    Configuration menu
    Copy the full SHA
    2c14fe6 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #74 from ThorstenBux/webassembly-support 

    Webassembly support
    @Neuroforge
    Neuroforge committed Jul 4, 2018
    Configuration menu
    Copy the full SHA
    b96dfa1 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2018

  1. performance tests

    @ThorstenBux
    ThorstenBux committed Aug 26, 2018
    Configuration menu
    Copy the full SHA
    b2a6c75 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2019

  1. deleting deprecated method at line 1216

    @kalwalt
    kalwalt committed Feb 6, 2019
    Configuration menu
    Copy the full SHA
    336397e View commit details
    Browse the repository at this point in the history

  2. adding artoolkit minifyed version

    @kalwalt
    kalwalt committed Feb 6, 2019
    Configuration menu
    Copy the full SHA
    daf1322 View commit details
    Browse the repository at this point in the history

  3. trying to compile the lib with AR_PIXEL_FORMAT_MONO

    @kalwalt
    kalwalt committed Feb 6, 2019
    Configuration menu
    Copy the full SHA
    83813eb View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2019

  1. NO_BROWSER flag is no longer needed/used by emscripten 1.37 +

    @kalwalt
    kalwalt committed Feb 7, 2019
    Configuration menu
    Copy the full SHA
    724a01f View commit details
    Browse the repository at this point in the history

  2. added variable for compiling BUILD_WASM_FILE = 'artoolkit_wasm.js'

    @kalwalt
    kalwalt committed Feb 7, 2019
    Configuration menu
    Copy the full SHA
    c57c7c5 View commit details
    Browse the repository at this point in the history

  3. added flags to use ZLIB

    @kalwalt
    kalwalt committed Feb 7, 2019
    Configuration menu
    Copy the full SHA
    f489f48 View commit details
    Browse the repository at this point in the history

  4. added msse flags

    @kalwalt
    kalwalt committed Feb 7, 2019
    Configuration menu
    Copy the full SHA
    a2f8976 View commit details
    Browse the repository at this point in the history

  5. added compile_kpm statement for the lib compilation

    @kalwalt
    kalwalt committed Feb 7, 2019
    Configuration menu
    Copy the full SHA
    6534720 View commit details
    Browse the repository at this point in the history

  6. added compile_wasm and modified compile

    @kalwalt
    kalwalt committed Feb 7, 2019
    Configuration menu
    Copy the full SHA
    e196ff2 View commit details
    Browse the repository at this point in the history

  7. better log error and addJob for compiling kpm (not sure if correct)

    @kalwalt
    kalwalt committed Feb 7, 2019
    Configuration menu
    Copy the full SHA
    1c90c4d View commit details
    Browse the repository at this point in the history

  8. changes from BUILD_FILE to BUILD_DEBUG_FILE and compile_all

    @kalwalt
    kalwalt committed Feb 7, 2019
    Configuration menu
    Copy the full SHA
    9ad5f87 View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2019

  1. adding more MAIN_SOURCES def

    @kalwalt
    kalwalt committed Feb 8, 2019
    Configuration menu
    Copy the full SHA
    0ebc0de View commit details
    Browse the repository at this point in the history

  2. more ar_sources

    @kalwalt
    kalwalt committed Feb 8, 2019
    Configuration menu
    Copy the full SHA
    387aeb3 View commit details
    Browse the repository at this point in the history

  3. added -D HAVE_NFT

    @kalwalt
    kalwalt committed Feb 8, 2019
    Configuration menu
    Copy the full SHA
    f0cea17 View commit details
    Browse the repository at this point in the history

  4. added -Wno-warn-absolute-paths flag

    @kalwalt
    kalwalt committed Feb 8, 2019
    Configuration menu
    Copy the full SHA
    7b6a792 View commit details
    Browse the repository at this point in the history

  5. reverting to 9ad5f87

    @kalwalt
    kalwalt committed Feb 8, 2019
    Configuration menu
    Copy the full SHA
    c9af3bc View commit details
    Browse the repository at this point in the history

  6. fixing issue with window

    @kalwalt
    kalwalt committed Feb 8, 2019
    Configuration menu
    Copy the full SHA
    b8d5cfc View commit details
    Browse the repository at this point in the history

  7. reverting to RGBA pixel format because code not detect nft markers

    @kalwalt
    kalwalt committed Feb 8, 2019
    Configuration menu
    Copy the full SHA
    2d671d0 View commit details
    Browse the repository at this point in the history

  8. new debug and min lib

    @kalwalt
    kalwalt committed Feb 8, 2019
    Configuration menu
    Copy the full SHA
    7d95d41 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2019

  1. trying to update to the latest, partially

    @kalwalt
    kalwalt committed May 28, 2019
    Configuration menu
    Copy the full SHA
    0abbf16 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2019

  1. better but issue with jpeg lib

    @kalwalt
    kalwalt committed Jun 1, 2019
    Configuration menu
    Copy the full SHA
    b3b9682 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2019

  1. this is compiled without errors

    @kalwalt
    kalwalt committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    b5d527b View commit details
    Browse the repository at this point in the history

  2. no undefinded symbols and examples

    @kalwalt
    kalwalt committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    2ddedd4 View commit details
    Browse the repository at this point in the history

  3. using pixFormat variable

    @kalwalt
    kalwalt committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    c647b52 View commit details
    Browse the repository at this point in the history

  4. adding typescripts

    @kalwalt
    kalwalt committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    8220c78 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2019

  1. adding videoLuma and videoLumaPointer

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    fee9da1 View commit details
    Browse the repository at this point in the history

  2. missed videoSize

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    c5e3c2b View commit details
    Browse the repository at this point in the history

  3. adding console error

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    0a627ed View commit details
    Browse the repository at this point in the history

  4. adding transformGL_RH

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    e48384b View commit details
    Browse the repository at this point in the history

  5. Debug Luma in DebugDraw function!

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    544c071 View commit details
    Browse the repository at this point in the history

  6. changes in debugSetup

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    10053ab View commit details
    Browse the repository at this point in the history

  7. added other properties

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    603a4c2 View commit details
    Browse the repository at this point in the history

  8. new dispose function

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    28890c7 View commit details
    Browse the repository at this point in the history

  9. new play function in artoolkit.api

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    a92121a View commit details
    Browse the repository at this point in the history

  10. new success function

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    41a6975 View commit details
    Browse the repository at this point in the history

  11. minor fixes in getUserMedia artoolkit.api

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    d5d33ae View commit details
    Browse the repository at this point in the history

  12. last fixes in getUserMedia

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    91090c8 View commit details
    Browse the repository at this point in the history

  13. changes in getUserMediaARController()

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    b6b6ca2 View commit details
    Browse the repository at this point in the history

  14. adding _teardownVideo() function

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    3256195 View commit details
    Browse the repository at this point in the history

  15. updated ARCameraParam

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    4ea9292 View commit details
    Browse the repository at this point in the history

  16. missed cameraPara

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    8356e6c View commit details
    Browse the repository at this point in the history

  17. updated trackPatternMarkerId

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    2b0e3e4 View commit details
    Browse the repository at this point in the history

  18. updated trackBarcodeMarkerId

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    913a4ce View commit details
    Browse the repository at this point in the history

  19. updated loadMarker() function

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    44d71c0 View commit details
    Browse the repository at this point in the history

  20. changing UID in getTransMatSquare and other funcs

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    9ff9d15 View commit details
    Browse the repository at this point in the history

  21. modified transMatToGLMat()

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    31f49d3 View commit details
    Browse the repository at this point in the history

  22. adding new arglCameraViewRHf() function

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    28b05fd View commit details
    Browse the repository at this point in the history

  23. rebuild libs

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    17dd35d View commit details
    Browse the repository at this point in the history

  24. updated load function

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    1cd810e View commit details
    Browse the repository at this point in the history

  25. updates in addMarker()

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    50777d8 View commit details
    Browse the repository at this point in the history

  26. minor changes in a forEach(...)

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    fd4f890 View commit details
    Browse the repository at this point in the history

  27. updates in addMultiMarker(...)

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    c8324d2 View commit details
    Browse the repository at this point in the history

  28. minor fix in loadCamera()

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    3a945e7 View commit details
    Browse the repository at this point in the history

  29. addin errorCallback to ajax function

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    e10b492 View commit details
    Browse the repository at this point in the history

  30. linting

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    5c39254 View commit details
    Browse the repository at this point in the history

  31. rebuild libs

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    8fe3804 View commit details
    Browse the repository at this point in the history

  32. small changes in artoolkit.api as in master

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    51314eb View commit details
    Browse the repository at this point in the history

  33. changin matrix.elements to matrix.fromArray

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    8a00b40 View commit details
    Browse the repository at this point in the history

  34. linting

    @kalwalt
    kalwalt committed Jun 4, 2019
    Configuration menu
    Copy the full SHA
    82b49cf View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2019

  1. missed framepointer, framesize and dataHeap variables initialization

    @kalwalt
    kalwalt committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    43e1cc5 View commit details
    Browse the repository at this point in the history

  2. not this.width but this.canvas.width

    @kalwalt
    kalwalt committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    33bc94c View commit details
    Browse the repository at this point in the history

  3. changes in dispatchEvent

    @kalwalt
    kalwalt committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    9c2289c View commit details
    Browse the repository at this point in the history

  4. rebuilding libs

    @kalwalt
    kalwalt committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    7523114 View commit details
    Browse the repository at this point in the history

  5. small linting changes

    @kalwalt
    kalwalt committed Jun 5, 2019
    Configuration menu
    Copy the full SHA
    ccaeb65 View commit details
    Browse the repository at this point in the history

Commits on Jun 21, 2019

  1. last changes in the api and in the examples

    @kalwalt
    kalwalt committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    ecf114d View commit details
    Browse the repository at this point in the history

  2. small changes not relevant

    @kalwalt
    kalwalt committed Jun 21, 2019
    Configuration menu
    Copy the full SHA
    600ce4e View commit details
    Browse the repository at this point in the history

Commits on Jun 24, 2019

  1. missed an important memory allocation in ARToolKitJS.cpp

    @kalwalt
    kalwalt committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    96f193f View commit details
    Browse the repository at this point in the history

  2. changing vdeoframe to videoLuma in kpmMatching()

    @kalwalt
    kalwalt committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    41ffba6 View commit details
    Browse the repository at this point in the history

  3. adding matrixGL_RH to NFt markers routine

    @kalwalt
    kalwalt committed Jun 24, 2019
    Configuration menu
    Copy the full SHA
    89c5c99 View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2019

  1. adding nftMarkers to the typescript version

    @kalwalt
    kalwalt committed Jul 5, 2019
    Configuration menu
    Copy the full SHA
    9fc42bf View commit details
    Browse the repository at this point in the history

  2. removing the "var Module=typeof Module!=="undefined"?Module:{}"

    @kalwalt
    kalwalt committed Jul 5, 2019
    Configuration menu
    Copy the full SHA
    ba1c8bc View commit details
    Browse the repository at this point in the history

  3. only for testing

    @kalwalt
    kalwalt committed Jul 5, 2019
    Configuration menu
    Copy the full SHA
    33ece86 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2019

  1. this is the solution! Nft works now!

    @kalwalt
    kalwalt committed Jul 7, 2019
    Configuration menu
    Copy the full SHA
    ec9d72b View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2019

  1. onRuntimeInitialized in the artoolkit.api and async for debug script tag

    @kalwalt
    kalwalt committed Jul 9, 2019
    Configuration menu
    Copy the full SHA
    aaf4c9e View commit details
    Browse the repository at this point in the history

  2. adding -s BINARYEN_TRAP_MODE=clamp

    @kalwalt
    kalwalt committed Jul 9, 2019
    Configuration menu
    Copy the full SHA
    d7dad56 View commit details
    Browse the repository at this point in the history

  3. new rebuild wasm lib

    @kalwalt
    kalwalt committed Jul 9, 2019
    Configuration menu
    Copy the full SHA
    713d780 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2019

  1. removing deprecated URL.createObjectURL()

    @kalwalt
    kalwalt committed Jul 10, 2019
    Configuration menu
    Copy the full SHA
    6879bc8 View commit details
    Browse the repository at this point in the history

  2. new simple_video_wasm.html example

    @kalwalt
    kalwalt committed Jul 10, 2019
    Configuration menu
    Copy the full SHA
    12cb023 View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2019

  1. New nft example with wasm

    @kalwalt
    kalwalt committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    d2fc7e6 View commit details
    Browse the repository at this point in the history

  2. upgrading Three.js to r103

    @kalwalt
    kalwalt committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    415e480 View commit details
    Browse the repository at this point in the history

  3. removing deprecated FlatShading

    @kalwalt
    kalwalt committed Jul 11, 2019
    Configuration menu
    Copy the full SHA
    885b0b6 View commit details
    Browse the repository at this point in the history

Commits on Jul 21, 2019

  1. adding async

    @kalwalt
    kalwalt committed Jul 21, 2019
    Configuration menu
    Copy the full SHA
    ba91ad0 View commit details
    Browse the repository at this point in the history

  2. adding --profiling in DEBUG

    @kalwalt
    kalwalt committed Jul 21, 2019
    Configuration menu
    Copy the full SHA
    9d1ecd2 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2019

  1. restoring web workers

    @kalwalt
    kalwalt committed Jul 29, 2019
    Configuration menu
    Copy the full SHA
    8f21f89 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2019

  1. adding trackingMod files

    @kalwalt
    kalwalt committed Jul 30, 2019
    Configuration menu
    Copy the full SHA
    e613291 View commit details
    Browse the repository at this point in the history

  2. adding detectNFTMarker to ARController

    @kalwalt
    kalwalt committed Jul 30, 2019
    Configuration menu
    Copy the full SHA
    e3a8090 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2019

  1. changed libjpeg

    kalwalt committed Aug 8, 2019
    Configuration menu
    Copy the full SHA
    80d9515 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2019

  1. debug lib need to be async

    @kalwalt
    kalwalt committed Aug 14, 2019
    Configuration menu
    Copy the full SHA
    9f72249 View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2019

  1. deleting trackingMod because not-efficient at all

    @kalwalt
    kalwalt committed Aug 30, 2019
    Configuration menu
    Copy the full SHA
    5aa10bd View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2019

  1. fix: enhanced some doc, added pinball image, removed unuseful parts o… 

    …f code (css not used), added doc for input image constraints
    @nicolocarpignoli
    nicolocarpignoli committed Nov 11, 2019
    Configuration menu
    Copy the full SHA
    3057df3 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2019

  1. indentation and console.log. works on desktop, not working on mobile.

    @nicolocarpignoli
    nicolocarpignoli committed Nov 19, 2019
    Configuration menu
    Copy the full SHA
    ac4aef6 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2019

  1. nft_worker example refactor (comments and reorganizing folders/files)

    @nicolocarpignoli
    nicolocarpignoli committed Nov 21, 2019
    Configuration menu
    Copy the full SHA
    b53d8c0 View commit details
    Browse the repository at this point in the history

  2. added more doc on artoolkit api and proxy

    @nicolocarpignoli
    nicolocarpignoli committed Nov 21, 2019
    Configuration menu
    Copy the full SHA
    d4ec1ef View commit details
    Browse the repository at this point in the history

Commits on Nov 26, 2019

  1. added loader that stops when nft marker has been loaded

    @nicolocarpignoli
    nicolocarpignoli committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    a56ad58 View commit details
    Browse the repository at this point in the history

  2. object now disappear when tracking is lost

    @nicolocarpignoli
    nicolocarpignoli committed Nov 26, 2019
    Configuration menu
    Copy the full SHA
    608c258 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2019

  1. now triggers lostNFTMarker only if previously the same marker has bee… 

    …n found
    @nicolocarpignoli
    nicolocarpignoli committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    78e0873 View commit details
    Browse the repository at this point in the history

  2. hide content only if marker is lost for a certain time, defaults 200ms

    @nicolocarpignoli
    nicolocarpignoli committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    38400be View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2019

  1. adding a log for the flag

    @kalwalt
    kalwalt committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    d4166a0 View commit details
    Browse the repository at this point in the history

  2. added others ARLogi for the flag var

    @kalwalt
    kalwalt committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    9213957 View commit details
    Browse the repository at this point in the history

  3. added example nft_worker in the main index

    @kalwalt
    kalwalt committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    e1ef23d View commit details
    Browse the repository at this point in the history

  4. right printings: double instead of string

    @kalwalt
    kalwalt committed Dec 5, 2019
    Configuration menu
    Copy the full SHA
    bd0553c View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2019

  1. merging @misdake changes

    @kalwalt
    kalwalt committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    6a916ec View commit details
    Browse the repository at this point in the history

  2. Merge branch 'misdake-fixing-nft' into fixing-nft

    @kalwalt
    kalwalt committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    62a89f8 View commit details
    Browse the repository at this point in the history

  3. added loading page, modified video atttributes and play to try to pre… 

    …vent ios video problems
    @nicolocarpignoli
    nicolocarpignoli committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    85c9edd View commit details
    Browse the repository at this point in the history

  4. added nft_improved_worker in the main menu

    @kalwalt
    kalwalt committed Dec 6, 2019
    Configuration menu
    Copy the full SHA
    f66bd31 View commit details
    Browse the repository at this point in the history

Commits on Dec 7, 2019

  1. rebuild libraries with clamp mode

    @kalwalt
    kalwalt committed Dec 7, 2019
    Configuration menu
    Copy the full SHA
    df9c2cc View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2019

  1. adding a simple conditional for BINARYEN_TRAP_MODE=clamp

    @kalwalt
    kalwalt committed Dec 8, 2019
    Configuration menu
    Copy the full SHA
    75fe87f View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2019

  1. adding examples with wasm plus worker

    @kalwalt
    kalwalt committed Dec 9, 2019
    Configuration menu
    Copy the full SHA
    d24c205 View commit details
    Browse the repository at this point in the history

  2. fixing the pinball path

    @kalwalt
    kalwalt committed Dec 9, 2019
    Configuration menu
    Copy the full SHA
    61f5d0a View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2019

  1. added gltf nft example

    @nicolocarpignoli
    nicolocarpignoli committed Dec 10, 2019
    Configuration menu
    Copy the full SHA
    a8e567a View commit details
    Browse the repository at this point in the history

  2. binaryen not needed with latest emscripten

    @kalwalt
    kalwalt committed Dec 10, 2019
    Configuration menu
    Copy the full SHA
    65df045 View commit details
    Browse the repository at this point in the history

Commits on Dec 11, 2019

  1. wasm file into nft folder

    @kalwalt
    kalwalt committed Dec 11, 2019
    Configuration menu
    Copy the full SHA
    8d57c93 View commit details
    Browse the repository at this point in the history

  2. new makem.js script also for windows

    @kalwalt
    kalwalt committed Dec 11, 2019
    Configuration menu
    Copy the full SHA
    8af0c60 View commit details
    Browse the repository at this point in the history

  3. cleaning the makem.js script by not needed commented code

    @kalwalt
    kalwalt committed Dec 11, 2019
    Configuration menu
    Copy the full SHA
    3467c2e View commit details
    Browse the repository at this point in the history

  4. updated readme

    @kalwalt
    kalwalt committed Dec 11, 2019
    Configuration menu
    Copy the full SHA
    ea00961 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2019

  1. makem.js script is cross-platform now

    @kalwalt
    kalwalt committed Dec 12, 2019
    Configuration menu
    Copy the full SHA
    3993f87 View commit details
    Browse the repository at this point in the history

  2. renaming file tracking2d.c to trackingMod2d.c to avoid confusion

    @kalwalt
    kalwalt committed Dec 12, 2019
    Configuration menu
    Copy the full SHA
    f1f086e View commit details
    Browse the repository at this point in the history

  3. removing outdated nft examples

    @kalwalt
    kalwalt committed Dec 12, 2019
    Configuration menu
    Copy the full SHA
    5bb50bd View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2019

  1. added nft_improved_worker_gltf to the examples index

    @kalwalt
    kalwalt committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    effdc2a View commit details
    Browse the repository at this point in the history

  2. removing nft_init_test.html

    @kalwalt
    kalwalt committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    719be34 View commit details
    Browse the repository at this point in the history

  3. added interpolation routine suggested by @hatsumatsu

    @kalwalt
    kalwalt committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    2d077df View commit details
    Browse the repository at this point in the history

  4. cleaning the code of nft_improved_worker_gltf/threejs_worker.js

    @kalwalt
    kalwalt committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    83d65ca View commit details
    Browse the repository at this point in the history

  5. removing reference of nft_init_test.html example from the examples index

    @kalwalt
    kalwalt committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    4c00612 View commit details
    Browse the repository at this point in the history

  6. deleting not necessary const frameLength

    @kalwalt
    kalwalt committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    f5a3a4f View commit details
    Browse the repository at this point in the history

  7. restoring the old name convention without Nft suffix

    @kalwalt
    kalwalt committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    cfcd678 View commit details
    Browse the repository at this point in the history

  8. other changes to the libs name

    @kalwalt
    kalwalt committed Dec 13, 2019
    Configuration menu
    Copy the full SHA
    4574aff View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2019

  1. automatically changes config.h.in to config.h

    @kalwalt
    kalwalt committed Dec 14, 2019
    Configuration menu
    Copy the full SHA
    476409e View commit details
    Browse the repository at this point in the history

  2. restructuring nft_improved_worker_gltf example

    @kalwalt
    kalwalt committed Dec 14, 2019
    Configuration menu
    Copy the full SHA
    9a3b6c9 View commit details
    Browse the repository at this point in the history

  3. moving the gltf example

    @kalwalt
    kalwalt committed Dec 14, 2019
    Configuration menu
    Copy the full SHA
    d545bda View commit details
    Browse the repository at this point in the history

  4. small fix for the ARTOOLKIT5_ROOT in makem.js, deleting NO_BROWSER

    @kalwalt
    kalwalt committed Dec 14, 2019
    Configuration menu
    Copy the full SHA
    9fe5f40 View commit details
    Browse the repository at this point in the history

  5. restructuring nft_improved_worker folder and files

    @kalwalt
    kalwalt committed Dec 14, 2019
    Configuration menu
    Copy the full SHA
    2a6b90d View commit details
    Browse the repository at this point in the history

  6. camera_para set the camera parameters through message now

    @kalwalt
    kalwalt committed Dec 14, 2019
    Configuration menu
    Copy the full SHA
    3bda503 View commit details
    Browse the repository at this point in the history

  7. deleting nft_worker example

    @kalwalt
    kalwalt committed Dec 14, 2019
    Configuration menu
    Copy the full SHA
    3770dca View commit details
    Browse the repository at this point in the history

  8. removing artoolkit.proxy.js

    @kalwalt
    kalwalt committed Dec 14, 2019
    Configuration menu
    Copy the full SHA
    63d9016 View commit details
    Browse the repository at this point in the history

Commits on Dec 16, 2019

  1. exclude files for libjpeg

    @kalwalt
    kalwalt committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    a740a06 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'fixing-nft' of https://github.com/kalwalt/jsartoolkit5 … 

    …into fixing-nft
    @kalwalt
    kalwalt committed Dec 16, 2019
    Configuration menu
    Copy the full SHA
    e07bd5f View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2019

  1. deleting nft_threejs.html example

    @kalwalt
    kalwalt committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    2910a89 View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2019

  1. reverting to makem.js without glob

    @kalwalt
    kalwalt committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    02f2076 View commit details
    Browse the repository at this point in the history

  2. minor addition to readme

    @nicolocarpignoli
    nicolocarpignoli committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    df87420 View commit details
    Browse the repository at this point in the history

  3. new fastcomp libjpeg.bc and switch to 1.38.44-fastcomp

    @kalwalt
    kalwalt committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    2edfbec View commit details
    Browse the repository at this point in the history

  4. new libs

    @kalwalt
    kalwalt committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    3b4bbc4 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into fixing-nft

    @kalwalt
    kalwalt committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    4aa28a8 View commit details
    Browse the repository at this point in the history

  6. restoring version from fixing-nft branch

    @kalwalt
    kalwalt committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    50d9063 View commit details
    Browse the repository at this point in the history

  7. fixing the build and restoring missed functions

    @kalwalt
    kalwalt committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    ac46aa8 View commit details
    Browse the repository at this point in the history

  8. missed createThreeNFTMarker function in artoolkit.three.js

    @kalwalt
    kalwalt committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    82276b9 View commit details
    Browse the repository at this point in the history

  9. fixing the Babylon example

    @kalwalt
    kalwalt committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    75df77d View commit details
    Browse the repository at this point in the history

  10. add papaparse needed for performance tests

    @ThorstenBux
    ThorstenBux committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    64014ac View commit details
    Browse the repository at this point in the history

  11. test fix

    @ThorstenBux
    ThorstenBux committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    fb6ff13 View commit details
    Browse the repository at this point in the history

  12. fixing threejs_from_scratch.html example

    @kalwalt
    kalwalt committed Dec 18, 2019
    Configuration menu
    Copy the full SHA
    3170168 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2019

  1. updated emscripten version in the Readme

    @kalwalt
    kalwalt committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    6b27072 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2019

  1. GLTF example: model now disappear when NFT marker is not tracked

    @kalwalt
    kalwalt committed Dec 22, 2019
    Configuration menu
    Copy the full SHA
    0abccc0 View commit details
    Browse the repository at this point in the history

  2. new example nft_armchair_image.html

    @kalwalt
    kalwalt committed Dec 22, 2019
    Configuration menu
    Copy the full SHA
    7282dac View commit details
    Browse the repository at this point in the history

  3. ar_sources for different platform in makem.js

    @kalwalt
    kalwalt committed Dec 22, 2019
    Configuration menu
    Copy the full SHA
    5cd456c View commit details
    Browse the repository at this point in the history

  4. fixing issue with getMarker in test.js

    @kalwalt
    kalwalt committed Dec 22, 2019
    Configuration menu
    Copy the full SHA
    d9c5468 View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2019

  1. removed strict mode and ecma6 code on worker

    @nicolocarpignoli
    nicolocarpignoli committed Dec 24, 2019
    Configuration menu
    Copy the full SHA
    a91d8bd View commit details
    Browse the repository at this point in the history

Commits on Dec 26, 2019

  1. adding a nft video example

    @kalwalt
    kalwalt committed Dec 26, 2019
    Configuration menu
    Copy the full SHA
    0a229f5 View commit details
    Browse the repository at this point in the history

  2. improves in the pinball video

    @kalwalt
    kalwalt committed Dec 26, 2019
    Configuration menu
    Copy the full SHA
    a2d72d7 View commit details
    Browse the repository at this point in the history

  3. fixed paths for camera param

    @kalwalt
    kalwalt committed Dec 26, 2019
    Configuration menu
    Copy the full SHA
    a8ccb80 View commit details
    Browse the repository at this point in the history

  4. remove part of the url in the worker.postMessage

    @kalwalt
    kalwalt committed Dec 26, 2019
    Configuration menu
    Copy the full SHA
    a05194f View commit details
    Browse the repository at this point in the history

  5. now loading gif end when NFT marker finish to load

    @kalwalt
    kalwalt committed Dec 26, 2019
    Configuration menu
    Copy the full SHA
    69c55f4 View commit details
    Browse the repository at this point in the history

Commits on Dec 27, 2019

  1. trying to improve the html

    @kalwalt
    kalwalt committed Dec 27, 2019
    Configuration menu
    Copy the full SHA
    5d0938b View commit details
    Browse the repository at this point in the history

  2. improved nft_pinball_video js code

    @kalwalt
    kalwalt committed Dec 27, 2019
    Configuration menu
    Copy the full SHA
    e38957c View commit details
    Browse the repository at this point in the history

  3. adding ar.js logo and loading text for waiting intro

    @kalwalt
    kalwalt committed Dec 27, 2019
    Configuration menu
    Copy the full SHA
    9d7c065 View commit details
    Browse the repository at this point in the history

  4. improvements in nft_armchair_image and nft_pinball_video examples

    @kalwalt
    kalwalt committed Dec 27, 2019
    Configuration menu
    Copy the full SHA
    8de1aa5 View commit details
    Browse the repository at this point in the history

Commits on Dec 28, 2019

  1. improves in the gltf example

    @kalwalt
    kalwalt committed Dec 28, 2019
    Configuration menu
    Copy the full SHA
    fa15cb1 View commit details
    Browse the repository at this point in the history

Commits on Jan 2, 2020

  1. Adds readme for docker build. 

    A bit of cleanup on the package.json and conf.json
    @ThorstenBux @kalwalt
    ThorstenBux authored and kalwalt committed Jan 2, 2020
    Configuration menu
    Copy the full SHA
    5236699 View commit details
    Browse the repository at this point in the history

  2. libjpeg cleanup

    @ThorstenBux @kalwalt
    ThorstenBux authored and kalwalt committed Jan 2, 2020
    Configuration menu
    Copy the full SHA
    ed7c4ce View commit details
    Browse the repository at this point in the history

  3. updated readme and removed build.sh

    @ThorstenBux @kalwalt
    ThorstenBux authored and kalwalt committed Jan 2, 2020
    Configuration menu
    Copy the full SHA
    914a15a View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2020

  1. small corrections in the README.md

    @kalwalt
    kalwalt committed Jan 3, 2020
    Configuration menu
    Copy the full SHA
    d343d82 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2020

  1. restoring 'use strict' directive in artoolkit.api.js

    @kalwalt
    kalwalt committed Jan 4, 2020
    Configuration menu
    Copy the full SHA
    a4d21cd View commit details
    Browse the repository at this point in the history

  2. Merge branch 'fixing-nft' into fixing-nft-w-binaryen

    @kalwalt
    kalwalt committed Jan 4, 2020
    Configuration menu
    Copy the full SHA
    416bc36 View commit details
    Browse the repository at this point in the history

  3. rebuild libs

    @kalwalt
    kalwalt committed Jan 4, 2020
    Configuration menu
    Copy the full SHA
    0fb6931 View commit details
    Browse the repository at this point in the history

  4. fixing message camera setting

    @kalwalt
    kalwalt committed Jan 4, 2020
    Configuration menu
    Copy the full SHA
    4e5f148 View commit details
    Browse the repository at this point in the history

  5. camera and video with wasm and worker examples

    @kalwalt
    kalwalt committed Jan 4, 2020
    Configuration menu
    Copy the full SHA
    d079755 View commit details
    Browse the repository at this point in the history

  6. stats works properly now in gltf example

    @kalwalt
    kalwalt committed Jan 4, 2020
    Configuration menu
    Copy the full SHA
    44c17ca View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2020

  1. renaming some file and improving the example

    @kalwalt
    kalwalt committed Jan 5, 2020
    Configuration menu
    Copy the full SHA
    d10de2e View commit details
    Browse the repository at this point in the history

  2. moving the BINARYEN flag only for WASM

    @kalwalt
    kalwalt committed Jan 5, 2020
    Configuration menu
    Copy the full SHA
    1bb7a0f View commit details
    Browse the repository at this point in the history

  3. deleting the video example from the index

    @kalwalt
    kalwalt committed Jan 5, 2020
    Configuration menu
    Copy the full SHA
    e4ab7d1 View commit details
    Browse the repository at this point in the history

  4. fix for the armchair example

    @kalwalt
    kalwalt committed Jan 5, 2020
    Configuration menu
    Copy the full SHA
    f36f635 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #18 from kalwalt/fixing-nft-w-binaryen 

    Adding NFT examples with WASM and a Worker.
    @kalwalt
    kalwalt committed Jan 5, 2020
    Configuration menu
    Copy the full SHA
    f566a50 View commit details
    Browse the repository at this point in the history

Commits on Jan 6, 2020

  1. WIP tests for NFT. 

    ASM tests done WASM tests missing. Might need to rework WASM test file.
    @ThorstenBux
    ThorstenBux committed Jan 6, 2020
    Configuration menu
    Copy the full SHA
    5d8fb7b View commit details
    Browse the repository at this point in the history

Commits on Jan 7, 2020

  1. fix for issue #22

    @kalwalt
    kalwalt committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    0d0efd9 View commit details
    Browse the repository at this point in the history

  2. add wasm tests

    @ThorstenBux
    ThorstenBux committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    be5274b View commit details
    Browse the repository at this point in the history

  3. add wasm NFT tests

    @ThorstenBux
    ThorstenBux committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    1d06eef View commit details
    Browse the repository at this point in the history

  4. Merge commit '0d0efd98dd42f80fcaa1f02ddc082cce09796851' into nft-tests 

    * commit '0d0efd98dd42f80fcaa1f02ddc082cce09796851':
  fix for issue #22

# Conflicts:
#	build/artoolkit.min.js
#	build/artoolkit_wasm.js
    @ThorstenBux
    ThorstenBux committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    ede299f View commit details
    Browse the repository at this point in the history

  5. enhanced readme

    @nicolocarpignoli
    nicolocarpignoli committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    da8ed80 View commit details
    Browse the repository at this point in the history

  6. trying to enhance resolution of camera

    @nicolocarpignoli
    nicolocarpignoli committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    34daca0 View commit details
    Browse the repository at this point in the history

  7. trying to enhance resolution of camera

    @nicolocarpignoli
    nicolocarpignoli committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    3d0aced View commit details
    Browse the repository at this point in the history

  8. fix loader times in threejs_worker_gltf

    @nicolocarpignoli
    nicolocarpignoli committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    901f6ff View commit details
    Browse the repository at this point in the history

  9. cleaned examples

    @nicolocarpignoli
    nicolocarpignoli committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    5ae3851 View commit details
    Browse the repository at this point in the history

  10. added detectNFTMArker description

    @kalwalt
    kalwalt committed Jan 7, 2020
    Configuration menu
    Copy the full SHA
    bdaa724 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2020

  1. Merge commit '5ae38515cec54e93999e040f8ad32202665e413f' into nft-tests 

    * commit '5ae38515cec54e93999e040f8ad32202665e413f':
  cleaned examples
  fix loader times in threejs_worker_gltf
  trying to enhance resolution of camera
  trying to enhance resolution of camera
  enhanced readme

# Conflicts:
#	build/artoolkit.debug.js
#	build/artoolkit_wasm.wasm
    @ThorstenBux
    ThorstenBux committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    6d9f719 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #21 from ThorstenBux/nft-tests 

    WIP tests for NFT.
    @kalwalt
    kalwalt committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    3160657 View commit details
    Browse the repository at this point in the history

  3. changes in 'Create ARController track image' test

    @kalwalt
    kalwalt committed Jan 8, 2020
    2 Configuration menu
    Copy the full SHA
    8328901 View commit details
    Browse the repository at this point in the history

  4. fixe for FS is not defined issue, see #16 (comment)

    @kalwalt
    kalwalt committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    c6f3d57 View commit details
    Browse the repository at this point in the history

  5. wrapping the code into a setTimeout function and restoring the debug … 

    …lib loading for the simple_image.html example
    @kalwalt
    kalwalt committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    2299dbc View commit details
    Browse the repository at this point in the history

  6. adding setTimeout() to threejs_from_scratch.html example

    @kalwalt
    kalwalt committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    6b94d31 View commit details
    Browse the repository at this point in the history

  7. minor style enhancement to index of examples

    @nicolocarpignoli
    nicolocarpignoli committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    87f0d46 View commit details
    Browse the repository at this point in the history

  8. Merge branch 'fixing-nft' of github.com:kalwalt/jsartoolkit5 into fix… 

    …ing-nft
    @nicolocarpignoli
    nicolocarpignoli committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    ff32e15 View commit details
    Browse the repository at this point in the history

  9. reverting simple_image.html to the initial version

    @kalwalt
    kalwalt committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    345fa02 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'fixing-nft' of https://github.com/kalwalt/jsartoolkit5 … 

    …into fixing-nft
    @kalwalt
    kalwalt committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    539f238 View commit details
    Browse the repository at this point in the history

  11. adding new NFT_MARKER marker type and other changes for AR.js

    @kalwalt
    kalwalt committed Jan 8, 2020
    Configuration menu
    Copy the full SHA
    9066705 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2020

  1. minor refactor

    @nicolocarpignoli
    nicolocarpignoli committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    78ddcd3 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'fixing-nft' of github.com:kalwalt/jsartoolkit5 into fix… 

    …ing-nft
    @nicolocarpignoli
    nicolocarpignoli committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    b79f471 View commit details
    Browse the repository at this point in the history

  3. small changes to avoid uglifyjs issue

    @kalwalt
    kalwalt committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    4a2fd7b View commit details
    Browse the repository at this point in the history

  4. added getNFTMarker description

    @kalwalt
    kalwalt committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    e443d49 View commit details
    Browse the repository at this point in the history

  5. setLogLevel, GetLogLevel, setMarkerInfoDir docs

    @kalwalt
    kalwalt committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    a4faed2 View commit details
    Browse the repository at this point in the history

  6. other descriptions for the setters and getters

    @kalwalt
    kalwalt committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    13c42e1 View commit details
    Browse the repository at this point in the history

  7. last descriptions

    @kalwalt
    kalwalt committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    0a9ef5e View commit details
    Browse the repository at this point in the history

  8. deleting the old part of the Readme and fix some path in README.md

    @kalwalt
    kalwalt committed Jan 9, 2020
    Configuration menu
    Copy the full SHA
    3c0e6b6 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2020

  1. small corrections

    @kalwalt
    kalwalt committed Jan 10, 2020
    Configuration menu
    Copy the full SHA
    44d9c07 View commit details
    Browse the repository at this point in the history

  2. added basic nft example

    @kalwalt
    kalwalt committed Jan 10, 2020
    Configuration menu
    Copy the full SHA
    4a78058 View commit details
    Browse the repository at this point in the history

  3. build docs and tests instructions

    @kalwalt
    kalwalt committed Jan 10, 2020
    Configuration menu
    Copy the full SHA
    7b68ce1 View commit details
    Browse the repository at this point in the history

  4. Issue tracker

    @kalwalt
    kalwalt committed Jan 10, 2020
    Configuration menu
    Copy the full SHA
    e832c81 View commit details
    Browse the repository at this point in the history

  5. es5 for every nft examples

    @nicolocarpignoli
    nicolocarpignoli committed Jan 10, 2020
    2 Configuration menu
    Copy the full SHA
    2103d75 View commit details
    Browse the repository at this point in the history

  6. missing es6 fixes

    @nicolocarpignoli
    nicolocarpignoli committed Jan 10, 2020
    Configuration menu
    Copy the full SHA
    33bda73 View commit details
    Browse the repository at this point in the history

  7. removing libjpeg from .gitignore

    @kalwalt
    kalwalt committed Jan 10, 2020
    Configuration menu
    Copy the full SHA
    381b1aa View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2020

  1. Added a general description for NFT and types of markers

    @kalwalt
    kalwalt committed Jan 12, 2020
    Configuration menu
    Copy the full SHA
    900fdb6 View commit details
    Browse the repository at this point in the history

Commits on Jan 13, 2020

  1. ms to fps and other little improvements in the no wasm example

    @kalwalt
    kalwalt committed Jan 13, 2020
    Configuration menu
    Copy the full SHA
    6d8b508 View commit details
    Browse the repository at this point in the history

  2. aligning the main_threejs_worker.html example to the asm version

    @kalwalt
    kalwalt committed Jan 13, 2020
    Configuration menu
    Copy the full SHA
    53fb34a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'fixing-nft' into api-doc-improvements

    @kalwalt
    kalwalt committed Jan 13, 2020
    Configuration menu
    Copy the full SHA
    848ca0e View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2020

  1. link to the NFT-Marker-Creator wiki

    @kalwalt
    kalwalt committed Jan 16, 2020
    Configuration menu
    Copy the full SHA
    93f21ca View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2020

  1. updated emscripten version

    @kalwalt
    kalwalt committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    2bc9b51 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #25 from kalwalt/api-doc-improvements 

    Api doc improvements and deleted old documentation in the Readme.md
    @kalwalt
    kalwalt committed Jan 17, 2020
    Configuration menu
    Copy the full SHA
    905f3ef View commit details
    Browse the repository at this point in the history