Andrew Meadows
f3255eeb0e
Merge pull request #4008 from birarda/lasagna-not-spaghetti
...
some Audio cleanup in prep for audio untangle
2015-01-06 09:13:12 -08:00
ZappoMan
570607c044
renderLines
2015-01-06 08:58:41 -08:00
ZappoMan
0606861b66
dashed lines in GeometryCache
2015-01-05 21:45:17 -08:00
ZappoMan
56a3f98b27
renderLinestrip() for audio scope and 3d rectangle overlays
2015-01-05 21:04:56 -08:00
ZappoMan
a9b7367fa9
more work on eliminating immediate mode calls
2015-01-05 20:51:05 -08:00
Brad Hefta-Gaub
a88346467b
Merge pull request #4042 from samcake/tot
...
Change sun location to be the direction for lighting
2015-01-05 20:36:28 -08:00
Brad Hefta-Gaub
21e3687678
Merge pull request #4041 from AndrewMeadows/inertia
...
Include damping in model of remote extrapolation
2015-01-05 20:36:14 -08:00
ZappoMan
9545bd1907
add alternate renderGrid for audio scope
2015-01-05 19:34:37 -08:00
Andrew Meadows
278be3d31b
remove use of "radius" property for entities
...
use "dimensions" instead
2015-01-05 18:13:50 -08:00
Sam Gateau
4ffb3e4e7e
just do the sun location modification
2015-01-05 17:31:47 -08:00
Andrew Meadows
0a8437a578
increasing default restitution to 0.5
2015-01-05 17:31:23 -08:00
Andrew Meadows
ec86f0bd50
fixing toyball.js to work under Bullet
2015-01-05 17:30:50 -08:00
ZappoMan
0e943ae240
remove render view frustum mode
2015-01-05 17:23:10 -08:00
ZappoMan
bd1612f6a4
Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing
2015-01-05 16:51:31 -08:00
Sam Gateau
2fdcbb1a97
changing the atmoshpere position
2015-01-05 16:46:42 -08:00
ZappoMan
7cf4bd1860
remove head mouse
2015-01-05 16:29:02 -08:00
ZappoMan
8b22b166ac
convert lookat vectors and laser pointers to use renderLine()
2015-01-05 16:06:35 -08:00
ZappoMan
a20fa1242d
first cut are removing immediate mode GL_LINES
2015-01-05 15:46:48 -08:00
Andrew Meadows
cf235705da
mention Bullet in BUILD.md dependencies
2015-01-05 15:29:02 -08:00
Stephen Birarda
f116d0bf5d
block until audio IO stops on app quit
2015-01-05 15:20:36 -08:00
Andrew Meadows
e2884c56f5
only predict remote transform for moving objects
2015-01-05 15:16:03 -08:00
Andrew Meadows
11de33b98b
merge upstream/master into andrew/inertia
2015-01-05 15:02:53 -08:00
Andrew Meadows
75a8faec86
purge support for voxels from PhysicsEngine
2015-01-05 15:02:18 -08:00
Sam Gateau
56758759e5
making the sun position a direction
2015-01-05 15:02:12 -08:00
Andrew Meadows
244a8503ef
include damping in remote extrapolation model
2015-01-05 14:48:16 -08:00
Stephen Birarda
dbe4b6ccc0
include QDesktopServices in UpdateDialog
2015-01-05 14:45:41 -08:00
Stephen Birarda
9bcacaf512
put back declared constructor, inputReceived signal
2015-01-05 14:43:23 -08:00
Stephen Birarda
53ac1a2bb2
don't include QtGui from UpdateDialog
2015-01-05 14:41:38 -08:00
Stephen Birarda
51bba4884f
resolve conflicts on merge with upstream master
2015-01-05 14:40:48 -08:00
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