Andrzej Kapolka
ab9d414340
Doxygen comment fix.
2013-08-14 17:22:43 -07:00
Andrzej Kapolka
690e2c1965
Blur/add should be the default.
2013-08-14 16:58:04 -07:00
Andrzej Kapolka
7cd1360ba7
Doxygen-style comments.
2013-08-14 16:48:00 -07:00
Andrzej Kapolka
621d32b506
Merge branch 'master' of https://github.com/worklist/hifi into glow
2013-08-14 16:41:30 -07:00
Andrzej Kapolka
8238d0d380
Merge pull request #851 from birarda/master
...
intial rev of Doxyfile
2013-08-14 16:41:22 -07:00
Andrzej Kapolka
a9ccca3f72
Diffuse/add glow mode.
2013-08-14 16:13:30 -07:00
Andrzej Kapolka
e2513901ef
Merge branch 'master' of https://github.com/worklist/hifi into glow
2013-08-14 14:38:21 -07:00
Stephen Birarda
bedd98cdfd
initial rev of Doxyfile to generate HTML documentation for our classes
2013-08-14 14:20:47 -07:00
Andrzej Kapolka
15f129f32d
Added simple additive/blur-with-persist glow modes, means to cycle through
...
modes.
2013-08-14 14:14:47 -07:00
ZappoMan
d4fc4617af
Merge pull request #850 from ey6es/glow
...
Added generic glow effect, enabled for voxel create/delete and follow indicators.
2013-08-14 13:05:20 -07:00
Andrzej Kapolka
d24e340c91
To keep the frame rate up, let's only sample eight points for the blur.
2013-08-13 14:52:35 -07:00
Andrzej Kapolka
581b60995a
Merge branch 'master' of https://github.com/worklist/hifi into glow
2013-08-13 14:37:10 -07:00
Andrzej Kapolka
0bd54845d2
Merge pull request #849 from ey6es/master
...
Gonna access that vector from two threads? Need to lock it. This was crashing all the time for me.
2013-08-13 14:33:32 -07:00
Andrzej Kapolka
48bee0e52c
Gonna access that vector from two threads? Need to lock it.
2013-08-13 14:29:49 -07:00
Andrzej Kapolka
01cd0d2a1f
Have the glow effect add half of the original texture, too, and use it on the
...
follow indicator.
2013-08-13 14:22:29 -07:00
Andrzej Kapolka
f6209b702c
Use glow effect for follow indicator.
2013-08-13 13:16:59 -07:00
Andrzej Kapolka
b05b43f027
Render to texture first, rather than copying from the frame buffer. Copying
...
from the frame buffer requires it to have an alpha channel, which actually
does something on OS X (meaning we have to set it to 1.0). We're going to
want to render to texture anyway for SSAO (or other effects).
2013-08-13 12:27:52 -07:00
Andrzej Kapolka
c1f6794295
Merge branch 'master' of https://github.com/worklist/hifi into glow
2013-08-13 09:49:18 -07:00
Stephen Birarda
015ff4a801
Merge pull request #848 from ZappoMan/bugfixes
...
make voxel fade shorter elapsed time and logarithmic instead of linear
2013-08-12 17:00:50 -07:00
ZappoMan
d56fa5a933
Merge branch 'master' of https://github.com/worklist/hifi into bugfixes
2013-08-12 09:12:43 -07:00
Philip Rosedale
6e2e58a1e4
Merge pull request #847 from ZappoMan/master
...
voxel sending/processing improvements
2013-08-10 15:11:56 -07:00
ZappoMan
55f03608ab
make voxel fade shorter elapsed time and logarithmic instead of linear
2013-08-10 12:20:01 -07:00
ZappoMan
8e2fcffd5c
enabled Low Res sending while moving by default
2013-08-10 11:58:25 -07:00
ZappoMan
b5e2bc2093
implement threaded voxel processing
2013-08-10 11:35:59 -07:00
ZappoMan
22100bd035
Merge pull request #846 from ZappoMan/master
...
fix small build issue in voxel-edit
2013-08-10 11:32:56 -07:00
ZappoMan
996314012e
fix small build issue in voxel-edit
2013-08-10 11:31:48 -07:00
Andrzej Kapolka
a3cee5d052
More efficiency for glow effect.
2013-08-09 16:16:02 -07:00
Andrzej Kapolka
9189a206b8
Merge branch 'master' of https://github.com/worklist/hifi into glow
2013-08-09 10:12:47 -07:00
ZappoMan
30e8b6c95d
Merge pull request #845 from ZappoMan/master
...
change path of flying bug
2013-08-08 17:49:36 -07:00
ZappoMan
11212ca8d0
change path of flying bug
2013-08-08 17:48:45 -07:00
Andrzej Kapolka
1828a105d4
Basic glow effect.
2013-08-08 16:55:45 -07:00
Stephen Birarda
da97cf75b4
Merge pull request #842 from Atlante45/master
...
Follow mode improvements
2013-08-08 16:32:35 -07:00
atlante45
521eb19625
PR comments + Changed MIN and MAX scale
2013-08-08 16:22:26 -07:00
Stephen Birarda
60119ddd52
Merge pull request #843 from PhilipRosedale/master
...
Better collision and click voxel sounds
2013-08-08 16:16:19 -07:00
Stephen Birarda
81d53b68a3
Merge pull request #844 from ZappoMan/master
...
fixed LOD disappear on backing up
2013-08-08 16:15:19 -07:00
Philip Rosedale
0e1149a8ef
Fixes per review
2013-08-08 16:11:51 -07:00
Stephen Birarda
789c2d9f78
Merge pull request #837 from ZappoMan/split_tool
...
added tool for splitting SVOs on jurisdiction boundaries
2013-08-08 16:11:38 -07:00
Philip Rosedale
d5a0b2ff93
Fixes per review
2013-08-08 16:10:07 -07:00
ZappoMan
2c96296936
fixed LOD disappear on backing up
2013-08-08 16:08:06 -07:00
ZappoMan
0e9e4c8c07
cr feedback
2013-08-08 16:05:30 -07:00
Philip Rosedale
43ad461275
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-08 16:01:02 -07:00
Philip Rosedale
45961b2b64
Collision and click sounds improved
2013-08-08 16:00:50 -07:00
atlante45
1117bb4305
Merge branch 'master' of https://github.com/worklist/hifi
2013-08-08 15:51:07 -07:00
atlante45
f5fe965093
Position based follow mode whith head movement
2013-08-08 15:49:35 -07:00
atlante45
b1e975e96b
Don't show pie menu when on voxel
2013-08-08 15:48:33 -07:00
ZappoMan
a5459f8ab5
Merge pull request #840 from birarda/master
...
repair header byte calculations in assignment server
2013-08-08 15:22:22 -07:00
Stephen Birarda
5cc59455f8
Merge pull request #841 from ZappoMan/master
...
add parameter for Dump Voxels on Move
2013-08-08 15:20:48 -07:00
ZappoMan
299696e7a4
add parameter for Dump Voxels on Move
2013-08-08 15:20:08 -07:00
Stephen Birarda
a661d9f2f4
repair header byte calculations in assignment server
2013-08-08 15:19:48 -07:00
Stephen Birarda
a234deeb15
Merge pull request #839 from ZappoMan/dontdumpvoxels
...
Don't Dump Voxel Node Bag on Move
2013-08-08 15:09:51 -07:00
