37 commits

Author	SHA1	Message	Date
Andrzej Kapolka	182f4e70af	More work on skeleton tracking.	2013-07-01 15:01:36 -07:00
Andrzej Kapolka	4e9595f794	Merge branch 'master' of https://github.com/worklist/hifi into kinected	2013-07-01 09:49:01 -07:00
Andrzej Kapolka	a1cab3ddc6	Working on getting skeleton data.	2013-07-01 09:48:36 -07:00
Andrzej Kapolka	b4b09b0070	Back up and running, now with OpenNI rather than libfreenect.	2013-06-28 17:31:49 -07:00
Andrzej Kapolka	ea9566596a	Build OpenNI/NITE into interface if available.	2013-06-28 16:47:08 -07:00
Andrzej Kapolka	5ef400b193	Got the depth information displaying.	2013-06-26 15:35:44 -07:00
Andrzej Kapolka	5e989b6ee5	More work on obtaining Kinect data.	2013-06-26 12:19:10 -07:00
Stephen Birarda	5cf89e90d7	fix redundancy in reference to Rect for OpenCV	2013-06-25 16:45:14 -07:00
Andrzej Kapolka	3d214c2655	More work on Kinect integration.	2013-06-25 15:26:07 -07:00
Andrzej Kapolka	1d578d5b0e	Lots of Kinect bits.	2013-06-25 14:27:13 -07:00
Andrzej Kapolka	281aee1f12	Increased smoothing substantially to reduce effect of jittering face rect.	2013-06-20 16:22:46 -07:00
Andrzej Kapolka	b0dd5223e1	Avatar head roll/lean based on webcam data.	2013-06-20 14:20:03 -07:00
Andrzej Kapolka	b14a0c1554	Reset webcam along with other sensors on spacebar, added settings config for ... non-Apple.	2013-06-20 11:44:47 -07:00
Andrzej Kapolka	0dc0552f50	Basic Haar cascade/CamShift tracking.	2013-06-19 18:02:26 -07:00
Andrzej Kapolka	d4d662b3f5	Convert frame to grayscale and equalize.	2013-06-19 14:13:42 -07:00
Andrzej Kapolka	2e52925496	Bump this up to 60 again.	2013-06-19 11:22:41 -07:00
Andrzej Kapolka	46b3d829d5	Round FPS display.	2013-06-19 11:06:51 -07:00
Andrzej Kapolka	1651044234	Disable auto exposure, set exposure rather high (which causes a lower exposure ... time).	2013-06-19 11:02:48 -07:00
Andrzej Kapolka	963b033e41	Fixed warning on OS X, playing with settings.	2013-06-19 10:50:58 -07:00
Andrzej Kapolka	352f7ca3cf	Provide option to enable/disable webcam (disabled by default).	2013-06-19 10:46:54 -07:00
Andrzej Kapolka	cc9f8bc717	Adjustments to UVCCameraControl invocation.	2013-06-18 18:15:52 -07:00
Andrzej Kapolka	2e033631eb	Make our call to configureCamera on OS X.	2013-06-18 16:50:15 -07:00
Andrzej Kapolka	4519b43072	Initialization order fix.	2013-06-18 14:48:58 -07:00
Andrzej Kapolka	9cb671aa56	Slightly better fps computation.	2013-06-18 14:43:19 -07:00
Andrzej Kapolka	e1f76b2bdf	Limit the rate at which we acquire images, since OS X doesn't block like Linux ... does.	2013-06-18 14:37:24 -07:00
Andrzej Kapolka	e98d1f9a92	Let's try getting the cam's fps.	2013-06-18 14:18:33 -07:00
Andrzej Kapolka	2ad8585f26	Show the acquisition fps.	2013-06-18 14:11:13 -07:00
Andrzej Kapolka	2a60414968	Set the desired webcam resolution and fps, report what we actually get.	2013-06-18 13:56:58 -07:00
Andrzej Kapolka	0fa710e518	Let's try using glPixelStore to specify the widthStep.	2013-06-18 13:39:54 -07:00
Andrzej Kapolka	2c2297b2bd	Let's try using widthStep rather than nChannels and computing the alpha ... values.	2013-06-18 13:30:31 -07:00
Andrzej Kapolka	a4324d71d5	If we don't get the image frame, try again later.	2013-06-18 13:08:16 -07:00
Andrzej Kapolka	9e92ea03da	Rather than copying to a QImage, just send the pointer. Also, put the render ... code in Webcam itself.	2013-06-18 12:13:40 -07:00
Andrzej Kapolka	341cde61f5	Allow four channel images, create a copy.	2013-06-17 18:21:35 -07:00
Andrzej Kapolka	a771f53df3	Read the webcam frames in a separate thread, since the call blocks.	2013-06-17 18:07:53 -07:00
Andrzej Kapolka	3c58f0c0a7	Must init webcam after OpenGL.	2013-06-17 16:24:47 -07:00
Andrzej Kapolka	c7ddc89803	Basic frame grab from camera; not currently working yet, but let's try on ... OS X!	2013-06-17 15:06:40 -07:00
Andrzej Kapolka	4421b21124	Working on reintegrating OpenCV (also, removed lodepng).	2013-06-17 13:24:01 -07:00