ZappoMan
c2d45df541
add renderBevelCornersRect to GeometryCache
2015-01-05 14:39:14 -08:00
Brad Hefta-Gaub
b385fe9679
Merge pull request #4040 from samcake/tot
...
Add the animated and moving entities to the shadow map
2015-01-05 14:23:07 -08:00
Ryan Huffman
defb2cbffd
Merge branch 'master' of git://github.com/highfidelity/hifi into audio-buffer-size
...
Conflicts:
interface/src/Audio.cpp
2015-01-05 14:07:06 -08:00
ZappoMan
bd38df2a15
replace GL_LINES with a call to renderWireBox for node bounds
2015-01-05 13:58:58 -08:00
Sam Gateau
f03b253260
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
2015-01-05 13:23:14 -08:00
Andrew Meadows
162854c5a5
Merge pull request #4025 from ZappoMan/voxelEctomy
...
Voxel ectomy
2015-01-05 13:20:30 -08:00
Sam Gateau
901ea16ba0
clean code
2015-01-05 13:17:12 -08:00
Sam Gateau
3e4cbfd2dc
clean code
2015-01-05 13:12:28 -08:00
Brad Hefta-Gaub
125dc5010e
Merge pull request #4039 from AndrewMeadows/inertia
...
Bullet physics part 2
2015-01-05 13:10:55 -08:00
Sam Gateau
7529b3d1b0
clean code
2015-01-05 13:10:32 -08:00
Ryan Huffman
c5e42aa50e
Merge pull request #4035 from ZappoMan/audioStarvation
...
add audio starvation detection
2015-01-05 13:05:27 -08:00
Andrew Meadows
0b9c9daed9
Merge pull request #4034 from ZappoMan/multiThreadedPerformanceTimer
...
Multi threaded performance timer
2015-01-05 13:01:59 -08:00
Sam Gateau
0b8b4c6d08
for simple shadow map, cover 2 regions of the view frustum and not just one for similar quality
2015-01-05 13:01:21 -08:00
Brad Hefta-Gaub
58a2a5eb83
Merge pull request #4027 from huffman/grid-shader-updates
...
Grid shader updates
2015-01-05 13:00:05 -08:00
dev
e3d474db3d
FIx shaders for mac
2015-01-05 12:27:16 -08:00
Andrew Meadows
6fb4e1f622
oops, need to update angularVelocity after damping
2015-01-05 12:23:55 -08:00
Andrew Meadows
bf6b8f9ca7
do not zero small velocities for non-bullet case
2015-01-05 12:01:09 -08:00
Sam Gateau
b8e44a3e7a
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
2015-01-05 11:27:53 -08:00
Sam Gateau
458ea6759e
Adding the shadow.slh file containing the shader functions used for shadowing, itis used by both normal and cascaded shadow deferred lighting passes
2015-01-05 11:27:29 -08:00
Andrew Meadows
21b2d14956
converting existing JS scripts to use new damping
...
Old formula the scripts were using: v *= damping
So a value of 0.999 was "little damping" and a value of 0.001 was "very strong damping",
but now that is reversed.
New formula: v *= (1 j- damping)^dt
A damping value of 0.001 now means "very little damping"
and a value of 0.999 means "very strong damping".
2015-01-05 11:25:15 -08:00
Andrew Meadows
3b7770f405
change meaning of damping to agree with bullet
...
0 = no damping
1 = 100% damping
The new formula is: velocity *= (1 - damping)^dt
2015-01-05 11:23:01 -08:00
Stephen Birarda
6d8f319e51
remove Audio methods re-introduced after merge
2015-01-05 09:27:01 -08:00
Stephen Birarda
dfb02aea0c
resolve conflicts on merge, add cstring inc
2015-01-05 09:25:30 -08:00
Andrew Meadows
d032eab0de
merge upstream/master into andrew/inertia
2015-01-05 09:19:37 -08:00
Andrew Meadows
30200ef7eb
add damping to ObjectMotionState
2015-01-05 09:17:46 -08:00
Philip Rosedale
315b932445
Merge pull request #4038 from ZappoMan/hydraHands
...
Make Hydra hands go neutral when resting on base.
2015-01-04 12:31:59 -08:00
Brad Hefta-Gaub
89e499a78f
only active sixsense palms
2015-01-04 12:26:30 -08:00
Philip Rosedale
218ae9c9d8
Hydra hands deactivate when placed back on controller base, removed measuring non-movement for inactivity
2015-01-04 12:12:57 -08:00
Philip Rosedale
a01ab38f1b
Merge pull request #4029 from Atlante45/new_glm_fix
...
Fix compile error with new glm version
2015-01-04 11:26:37 -08:00
Philip Rosedale
e16fa465f6
Merge pull request #4037 from highfidelity/revert-4015-master
...
Revert "Hydra hands deactivate when placed back on controller base"
2015-01-03 21:15:14 -08:00
Philip Rosedale
fefcdfa9f6
Revert "Hydra hands deactivate when placed back on controller base"
2015-01-03 21:03:23 -08:00
ZappoMan
b0ac9e22c1
Merge branch 'master' of https://github.com/highfidelity/hifi into audioStarvation
2015-01-02 17:33:25 -08:00
ZappoMan
1df54cffd6
add audio starvation detection
2015-01-02 17:28:51 -08:00
Ryan Huffman
bbfe2ff1b9
Merge branch 'master' of git://github.com/highfidelity/hifi into audio-buffer-size
2015-01-02 17:08:02 -08:00
Ryan Huffman
4a72a4be83
Add audio output buffer size to settings
2015-01-02 17:03:01 -08:00
Ryan Huffman
0d71d25063
Add min/max for audio buffer size
2015-01-02 17:02:44 -08:00
Philip Rosedale
9837521fc6
Merge pull request #4033 from ZappoMan/bugFix
...
remove PerformanceTimer from recalculateMeshBoxes() because it's not thread safe
2015-01-02 16:13:58 -08:00
Ryan Huffman
4c5bb66bd7
Add audio output buffer size to preferences
2015-01-02 16:01:04 -08:00
Ryan Huffman
f97109f6a4
Add outputBufferSizeFrames property to Audio
2015-01-02 16:00:07 -08:00
ZappoMan
4cc641320b
fix PerformanceTimer to handle timer stacks on multiple threads
2015-01-02 15:04:48 -08:00
ZappoMan
139f96c8b0
remove PerformanceTimer from recalculateMeshBoxes() because it's not thread safe
2015-01-02 14:41:09 -08:00
Philip Rosedale
384899e977
Merge pull request #4032 from Atlante45/uninitialized_entity_members
...
Initialize entities' _locked and _script
2015-01-02 14:01:55 -08:00
Philip Rosedale
1563b7ea0a
Merge pull request #4031 from samcake/tot
...
Simpler shadows only casted by the Avatar + make it work with lighlmpped surfaces
2015-01-02 13:52:33 -08:00
Atlante45
022beff569
Initialize entities' _locked and _script
2015-01-02 12:37:00 -08:00
Sam Gateau
0169d82fff
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
2015-01-02 12:16:17 -08:00
Sam Gateau
46ab4833be
applying the shadowing improvment to the cascaceded path shader and cleaning the code
2015-01-02 12:12:41 -08:00
Philip Rosedale
90cf9acef1
Merge pull request #4030 from huffman/220-position
...
Update inWorldTestTone.js to play in front of avatar
2015-01-02 11:48:48 -08:00
Ryan Huffman
cf04c3313a
Update inWorldTestTone.js to play in front of avatar
2015-01-02 11:43:41 -08:00
Sam Gateau
fe371730e3
Merge branch 'master' of https://github.com/highfidelity/hifi into tot
2015-01-02 11:30:16 -08:00
Sam Gateau
24d39f4453
refining the shadowing
2015-01-02 11:29:54 -08:00
