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 tests for NFT. #21

Merged
merged 5 commits into from
Jan 8, 2020
Merged

WIP tests for NFT. #21

merged 5 commits into from
Jan 8, 2020

Conversation

ThorstenBux
Copy link

ASM tests done WASM tests missing. Might need to rework WASM test file.

@ThorstenBux
WIP tests for NFT.
5d8fb7b 
ASM tests done WASM tests missing. Might need to rework WASM test file.
@ThorstenBux ThorstenBux mentioned this pull request Jan 6, 2020
Closed
@kalwalt kalwalt self-assigned this Jan 6, 2020
@kalwalt kalwalt added enhancement New feature or request javascript all about javascript code NFT nft markerless technology labels Jan 6, 2020
@kalwalt
Copy link
Owner

kalwalt commented Jan 7, 2020 •
edited
Loading

I'm testing this PR. I changed the line:
https://github.com/ThorstenBux/jsartoolkit5/blob/1d06eef2422917136af17a23515c74409bd0c93f/tests/tests.js#L104

i changed from skip to test and line 112:

-assert.deepEqual(trackableInfo.marker.idMatrix,0);
+assert.deepEqual(trackableInfo.data.marker.idMatrix,0);

and all tests was ok.
That change i did worked before but not now...
Regarding conflicting files maybe you should pull my recent commit from fixing-nft and should solve it.

@kalwalt kalwalt mentioned this pull request Jan 7, 2020
Closed
@ThorstenBux
Merge commit '0d0efd98dd42f80fcaa1f02ddc082cce09796851' into nft-tests
ede299f 
* commit '0d0efd98dd42f80fcaa1f02ddc082cce09796851':
  fix for issue kalwalt#22

# Conflicts:
#	build/artoolkit.min.js
#	build/artoolkit_wasm.js
@ThorstenBux
Copy link
Author

ThorstenBux commented Jan 7, 2020 via email

@kalwalt
Copy link
Owner

kalwalt commented Jan 7, 2020

@ThorstenBux Do you mean like for https://github.com/augmentmy-world/artoolkitX.js ?

@kalwalt
Copy link
Owner

kalwalt commented Jan 7, 2020

Releasing as package in the Github download would be fine. I think we should do in that way. We can discuss this if you want.
Anyway there are other conflicts to solve.

@ThorstenBux
Copy link
Author

ThorstenBux commented Jan 8, 2020 via email

@ThorstenBux
Merge commit '5ae38515cec54e93999e040f8ad32202665e413f' into nft-tests
6d9f719 
* 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
Copy link
Author

should be fixed now

@ThorstenBux
Copy link
Author

Releasing as package in the Github download would be fine. I think we should do in that way. We can discuss this if you want.
Anyway there are other conflicts to solve.

Once it is on artoolkitx/master the build would automatically kick in and release it on GitHub releases.

@kalwalt kalwalt merged commit 3160657 into kalwalt:fixing-nft Jan 8, 2020
@kalwalt kalwalt mentioned this pull request Jan 8, 2020
Closed
15 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@kalwalt kalwalt

Labels
enhancement New feature or request javascript all about javascript code NFT nft markerless technology
Projects
None yet
Milestone
merging NFT to artoolkitx/jsartoolkit...
Development

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