Граф коммитов

277 Коммитов

Автор SHA1 Сообщение Дата
Blair MacIntyre 33f548fc6c weird incorrect line fix
in render, was setting matrixWorldInverse to invalide value, which would be overwritten anywhat.
2018-04-14 09:29:54 -04:00
Blair MacIntyre f602fd5762 fixes to webrtc FOV and camera FOV 2018-04-12 16:38:08 -04:00
Blair MacIntyre 788861b1eb added start/stop video, fixed arkit timestamp offset 2018-04-11 10:00:13 -04:00
Blair MacIntyre 2695f7b3ba add marker generator 2018-04-11 08:19:57 -04:00
Blair MacIntyre 2ba48b3309 opencv demos
OpenCV face demo works.
Initial aruco marker tracker demo, still need to create anchors for markers.
added gl-matrix.js file that can be included directly in .html page
2018-04-10 23:31:53 -04:00
Blair MacIntyre ad31975409 cleaned up the code, re-enabled showing video 2018-04-06 08:30:05 -04:00
Blair MacIntyre ae73b8f7c9 fix speed a bit 2018-04-05 16:15:23 -04:00
Blair MacIntyre d06cf3a692
Merge pull request #91 from mozilla/opencv-sample-dev
Opencv sample dev
2018-04-05 12:27:08 -04:00
Blair MacIntyre 2dd8c1a736 first working checkin of new CV version
with opencv sample
2018-04-05 12:20:16 -04:00
Blair MacIntyre 712a6e666e Make CV work on normal browsers
We send the video frames from WebRTC to the app.

The data structure needs to be fixed (it's incorrect right now), but at least we can debug CV.

Needed to restructure a lot of things, and have the sample apps work with both YUV and RGBA buffers.
2018-04-04 00:37:57 -04:00
Blair MacIntyre e4a04f871b in progress, switching machines
this doesn't work right now, refactoring
2018-04-03 13:53:23 -04:00
Blair MacIntyre 40380a6c8d WIP on opencv 2018-04-03 07:14:36 -04:00
Blair MacIntyre a8c735c040 added XRVideoFrame
Encapsulated all the functionality of video frames (receiving, managing cached ArrayBuffers, lazilly converting from base60 to binary, etc) in an object.

Included methods to clean up workers (postMessageToWorker and postReplyMessage).  updated simplecv
2018-04-03 07:13:47 -04:00
Roberto Garrido 83d67ca365 Added the ability to remove anchors from an app via "frame.removeAnchor(anchorUID)" 2018-03-26 16:30:15 +02:00
Blair MacIntyre 42ba5bddb8 make Worker optional 2018-03-21 21:45:06 -04:00
Roberto Garrido 4473633a28 Added an alignEUS init option, that makes the ARKit initialize with ARWorldAlignmentGravityAndHeading configuration. Otherwise it'll be initialized with just ARWorldAlignmentGravity.
Also, fixed a typo.
2018-03-21 17:20:43 +01:00
Blair MacIntyre 746187765f re-activated Worker inside ARKitWrapper 2018-03-21 12:00:38 -04:00
Blair MacIntyre 1513e22473
Merge pull request #90 from mozilla/buffer-fix
fix for app update, buffer reuse
2018-03-20 21:51:29 -04:00
Blair MacIntyre 9729e4afe0 fix for app update, buffer reuse
Needed to pass ArrayBuffers into Workers and back out, and then back down to polyfill, in order to reuse them and not constantly reallocate
2018-03-20 21:50:42 -04:00
Blair MacIntyre 3e02d8b48b comment fix 2018-03-20 10:00:54 -04:00
Blair MacIntyre 7a8a699d6c removed incorrect comment 2018-03-20 08:45:29 -04:00
Roberto Garrido 278cf74f61 Register a new callback to let the app know when the user grants/denies sharing of computer data. 2018-03-20 07:27:24 +01:00
Blair MacIntyre 19d5ddfe8c disable internal worker; resync requests for next vid frame. 2018-03-19 16:05:06 -04:00
Blair MacIntyre 1334d0c412 wrapped worker.onmessage reply work in settimeout({},0) delay 2018-03-19 15:14:15 -04:00
Blair MacIntyre afd96faab5 move stats box so visible on iphonex 2018-03-19 13:34:16 -04:00
Blair MacIntyre 88aa96cc8a update with CV fps 2018-03-19 12:34:03 -04:00
Blair MacIntyre a9e13b4dcb moved buffer conversion into a worker, got workers working in web app 2018-03-19 11:47:23 -04:00
Blair MacIntyre 4b5cff16e8 test 2018-03-19 10:46:04 -04:00
Blair MacIntyre ba689405a4 another attempt at workers. still not working. 2018-03-19 09:00:16 -04:00
Blair MacIntyre edd62b810d print color at center of screen 2018-03-18 21:02:05 -04:00
Blair MacIntyre 42356c00ce update 2018-03-18 20:20:12 -04:00
Blair MacIntyre 2cd13d8819 simple update 2018-03-18 20:17:35 -04:00
Blair MacIntyre 51778bdaf1 working CV example 2018-03-18 16:09:28 -04:00
Blair MacIntyre 26537b88d5 initial simple CV example 2018-03-18 14:58:09 -04:00
Blair MacIntyre 958cf07b06 fixes for computer vision callbacks
- needed to pass session parameters all the way down
- removed extra calls to "watch" from flatDisplay (probably there because of the bug in event dispatch, which caused some to be missed)
- created vision events up through Display and Session.  In Session can now pass "computer_vision_data" as a session parameter, will cause iOS app to generate vision frames.
- can call session.requestVideoFrames() to start sending frames to the callback supplied
2018-03-18 14:57:53 -04:00
Blair MacIntyre 19b37f9f97 Need to make a copy of listener array before iterating
If a listener calls RemoveEventListener from it's handler, some listeners won't be called because the array changes out from under it
2018-03-18 14:53:42 -04:00
Blair MacIntyre ff07dcaebb fix using .transform instead of .modelMatrix 2018-03-15 11:01:30 -04:00
Roberto Garrido 884056dc69 Merge branch 'remove_nodes' into develop 2018-03-13 16:21:53 +01:00
Roberto Garrido f82ca48244 Added a new option in the AR Request: computer_vision_data.
If it's set to true, the app will start calling FlatDisplay._handleComputervisionData() passing a JSON object with the base64 string encoded buffers.
Once the polyfill does the processing, it must call ARKitWrapper.requestComputerVisionData() so that the app know that a new set of buffers must be sent.
2018-03-13 15:32:52 +01:00
Blair MacIntyre 838ab6c56d got rid of SITTING_EYE_HEIGHT, fixed floorAnchor
SITTING_EYE_HEIGHT was a hack, set it to 0 to no longer have an effort, should remove eventually.

Made "findFloorAnchor" return null in AR, and the stage height in VR.  Added the hack to create a fake floor in common.js, where it belongs.
2018-03-08 17:39:08 -05:00
Roberto Garrido a09bab16f1 Iterate the list of removed anchors so the corresponding nodes are also deleted. 2018-03-08 18:34:57 +01:00
Blair MacIntyre dc8ea76326 fix 2018-03-07 17:08:26 -05:00
Unboring SL 3d5b19ea07 Fix ARCore error with unused transform property 2018-02-27 15:53:26 +01:00
Unboring SL d6e903e46a Restore modelMatrix var and remove transform as property on planes and anchors objects 2018-02-26 11:32:37 +01:00
Unboring SL 9f00a6bf52 Change var name from modelMatrix to transform 2018-02-22 10:00:35 +01:00
Blair MacIntyre e4fa65a9bd
Merge pull request #86 from mozilla/develop
fix for broken prependElements call
2018-02-16 13:06:49 -05:00
Blair MacIntyre 524a124b01 fix for broken prependElements call 2018-02-16 13:02:55 -05:00
Blair MacIntyre bc1c29b935
Merge pull request #84 from mozilla/develop
Develop
2018-02-13 14:38:20 -08:00
Unboring SL 068d36ffa7 Fix for iOS devices 2018-02-13 09:44:06 +01:00
Unboring SL 67a2c38c04 Bind XRPolyfill to fix #83 2018-02-13 09:33:06 +01:00