Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-25 11:28:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
3962 commits 25 branches 0 tags 1.1 GiB
Commit graph

3962 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
5204a9634b change the trigger argument from d to t 2013-06-18 12:33:41 -07:00
Stephen Birarda
38d894db37 remove random sleep mode, simplify injector while 2013-06-18 12:32:04 -07:00
ZappoMan
01ae437343 Merge pull request #546 from ZappoMan/master 
Fix crash in voxel-server
 2013-06-18 12:26:18 -07:00
ZappoMan
9466e81590 fixed crash 2013-06-18 12:25: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
ZappoMan
43b6683007 Merge pull request #545 from ZappoMan/master 
build buster
 2013-06-18 12:11:53 -07:00
ZappoMan
8c44ad19a1 fixed build buster 2013-06-18 12:10:59 -07:00
Philip Rosedale
726872d955 Merge pull request #543 from ZappoMan/occlusion_culling 
Occlusion culling
 2013-06-18 12:07:33 -07:00
ZappoMan
1fc3ad8011 CR feedback 2013-06-18 12:03:58 -07:00
ZappoMan
7922c3b625 fixed typo 2013-06-18 12:02:17 -07:00
ZappoMan
8b18ee6844 renamed VoxelProjectedShadow class 2013-06-18 12:01:01 -07:00
ZappoMan
1c8767268b Merge pull request #544 from birarda/twopole 
correct audio mixer frame time stat
 2013-06-18 11:07:10 -07:00
Stephen Birarda
b51d3e88d3 impossible for percentageOfMaxElapsed to be zero 2013-06-18 10:49:15 -07:00
Stephen Birarda
5918c492cc correct stat collection for mixer frame time usage 2013-06-18 10:46:45 -07:00
ZappoMan
87bbbbc7d8 Merge pull request #542 from birarda/twopole 
smarten up the TwoPole tick call
 2013-06-18 10:39:57 -07:00
ZappoMan
9a22db28a3 code cleanup 2013-06-18 10:35:32 -07:00
ZappoMan
00438f9d99 code cleanup 2013-06-18 10:28:14 -07:00
ZappoMan
a6b4bdba53 code cleanup 2013-06-18 10:25:58 -07:00
ZappoMan
46d7ada753 code cleanup 2013-06-18 10:21:47 -07:00
ZappoMan
8331fc1acb removed some old debug code 2013-06-18 10:19:49 -07:00
Stephen Birarda
667fa566d5 Merge remote-tracking branch 'upstream/master' into twopole 2013-06-18 09:55:56 -07:00
Stephen Birarda
2ba7fe0031 remove the unused timevals 2013-06-18 09:55:04 -07:00
Stephen Birarda
8cef77bbda remove the timing for twopole testing 2013-06-18 09:53:30 -07:00
ZappoMan
58c4010185 added CoverageMap and occlusion culling to server 2013-06-18 09:36:43 -07:00
ZappoMan
c8d4b2ebed added erase() and some other tweaks to CoverageMap 2013-06-18 09:35:13 -07:00
ZappoMan
7fe6c0e3b3 added occlusion culling menu option 2013-06-18 09:34:12 -07:00
Stephen Birarda
5acb0bd1a3 add timing for two pole effect 2013-06-18 09:22:43 -07:00
Stephen Birarda
edc1377692 perform the two-pole effect across 256 samples, not one per call 2013-06-18 09:19:35 -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
0d4efad490 Missed QuartzCore. 2013-06-17 13:58:19 -07:00
Andrzej Kapolka
6b065ab856 Find Zlib the right way. 2013-06-17 13:57:01 -07:00
Andrzej Kapolka
2c0bea3f33 More required libraries for OS X. 2013-06-17 13:53:48 -07:00
Andrzej Kapolka
ec495e14d3 Missed these guys. 2013-06-17 13:29:24 -07:00
Andrzej Kapolka
4421b21124 Working on reintegrating OpenCV (also, removed lodepng). 2013-06-17 13:24:01 -07:00
tosh
e3da925e46 Merge branch 'master' of git://github.com/worklist/hifi into 19371 2013-06-17 07:18:19 +02:00
tosh
66f350d846 echo cancellation: ui, calibration, visualization 2013-06-17 07:16:29 +02:00
ZappoMan
c9e1c898c2 Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-06-14 19:50:38 -07:00
Andrzej Kapolka
dc3029b5a9 Merge pull request #540 from ZappoMan/encode_params 
Change encodeTreeBitstream() to use params class
 2013-06-14 17:25:57 -07:00
Andrzej Kapolka
d80e55a995 Merge pull request #541 from ey6es/master 
Fix for irises on OS X: compute and pass in the model space eye position as a uniform.
 2013-06-14 17:24:01 -07:00
Andrzej Kapolka
c11ab45474 It seems gl_ModelViewMatrixInverse is problematic on OS X; let's try passing 
in the camera's position as transformed into model space.
 2013-06-14 17:21:35 -07:00
ZappoMan
17ea2d0d0d Merge pull request #539 from ey6es/master 
Better iris texture, fixed iris rotations.
 2013-06-14 16:53:47 -07:00
ZappoMan
e083c0c561 spacing 2013-06-14 16:48:36 -07:00
Andrzej Kapolka
790cdfb0bd Added refraction to irises. 2013-06-14 16:46:34 -07:00
ZappoMan
08e8455c95 migrate encodeTreeBitstream() to use params class 2013-06-14 16:45:27 -07:00
Andrzej Kapolka
7d1679dab7 Ryan's new iris texture. 2013-06-14 14:35:56 -07:00
Andrzej Kapolka
5241c41ddd Shed some light on what these shaders are doing, so to speak. 2013-06-14 11:29:32 -07:00
Andrzej Kapolka
ec0b1a99fb Fix iris orientations: start with the head orientation, then rotate onto the 
lookat vector.  This way, the irises don't rotate around as we yaw.
 2013-06-14 11:23:08 -07:00