samcake
103e1c76b3
Member initialization respecting the standard
2015-09-29 09:26:29 -07:00
samcake
8a8411c8d1
Merge branch 'master' of https://github.com/highfidelity/hifi into calvin
2015-09-29 09:15:53 -07:00
Brad Hefta-Gaub
8da52e2f17
Merge pull request #5906 from kencooke/audio-src
...
Algorithmic optimization of new resampler
2015-09-28 20:44:27 -07:00
samcake
833c31a6a6
Merge pull request #5923 from jherico/lisa
...
Fix broken textures in stereo/HMD
2015-09-28 18:21:08 -07:00
samcake
1e9c19d535
Clean the Material FBX code and how we use the factor components for diffuse and specular
2015-09-28 17:46:48 -07:00
Brad Davis
adee97b95c
Merge pull request #5922 from ZappoMan/fixFlicker
...
fix the slight flicker that's being caused by error in calculating the model inverse matrix
2015-09-28 17:37:32 -07:00
Brad Hefta-Gaub
670df7e443
fix coding standard issue and comment
2015-09-28 17:36:42 -07:00
Brad Hefta-Gaub
bd52b17861
Merge pull request #5914 from jherico/homer
...
Remove duplicate DeferredBufferWrite.slh
2015-09-28 17:29:33 -07:00
samcake
202d2944ab
Merge branch 'master' of https://github.com/highfidelity/hifi into calvin
2015-09-28 17:24:59 -07:00
samcake
2a487a79a3
Getting something done today
2015-09-28 17:24:31 -07:00
Eric Levin
e8e9957846
Merge pull request #5911 from ZappoMan/rayIntersectionWork
...
adding surface normals to ray intersection
2015-09-28 17:21:40 -07:00
Brad Davis
375d783997
Better fix for texture issues in stereo
2015-09-28 17:13:51 -07:00
Brad Davis
88d48994ed
Disabling glVertexAttribFormat for now because of an issue with instancing
2015-09-28 16:17:56 -07:00
Brad Hefta-Gaub
32b56a4bf7
fix the slight flicker that's being caused by error in calculating the model inverse matrix
2015-09-28 16:09:57 -07:00
Howard Stearns
e6b9cbacf7
Merge pull request #5910 from hyperlogic/tony/small-anim-debug-improvements
...
Fix for Head when switching between HMD and Desktop mode
2015-09-28 14:13:03 -07:00
Brad Davis
e284cbe355
Remove duplicate DeferredBufferWrite.slh
2015-09-28 13:24:47 -07:00
samcake
728a4cb112
Adding the comment to the glActiveBindTexture call
2015-09-28 12:45:39 -07:00
samcake
95ea874d43
Minor fixes to the way the specular color is interpreted
2015-09-28 12:43:15 -07:00
Brad Davis
203c601e95
Fix for bad textures when using _glActiveBindTexture
2015-09-28 12:26:11 -07:00
Anthony J. Thibault
a495a45ed0
unset "lean" when headParams.enableLean is false
...
Also added AnimVariantMap::dump() which will print out all the
currently set anim vars and their values.
2015-09-28 11:10:22 -07:00
Brad Hefta-Gaub
3e758f3c6b
fix Triangle::getNormal, add normal display to rayPickExample
2015-09-28 09:05:39 -07:00
Brad Hefta-Gaub
ce3da099f6
normalize the surface normal from the triangle, coding standard fix, update example
2015-09-28 08:30:49 -07:00
Brad Hefta-Gaub
430cbcca7e
first cut at adding surface normals to ray intersection
2015-09-27 21:57:50 -07:00
Ken Cooke
aa01dca0a8
Fix compiler warnings
2015-09-27 19:14:31 -07:00
Anthony J. Thibault
c970ff0c0c
Reset joint priorities back to 0 for new animation system.
...
Added Rig::clearJointStatePriorities() to do this.
2015-09-27 18:25:28 -07:00
Anthony J. Thibault
4b31d87bf5
renamed magic constant to FRAMES_PER_SECOND.
2015-09-27 17:52:53 -07:00
Anthony J. Thibault
5a24a020ca
Fix for HMD rotation sticking between 2d & HMD mode
...
The main fix for this was to set the JointState animation priority to 3.0
The secondary fix was only noticed when we changed the animation priority
Basically, the debugRendering was using the JointStates after they were
manipulated by SkeletonModel to 'relax' them toward thier default pose for
IK purposes.
2015-09-27 17:44:54 -07:00
Anthony J. Thibault
a2562c92f4
Small changes to Anim System for Debugging
...
* Added constant for Rig animation fade time
* Added index output for AnimSkeleton::dump()
2015-09-27 16:24:55 -07:00
Ken Cooke
7faada24a8
Moved table to the top, so it can be declared static
2015-09-27 15:45:00 -07:00
Ken Cooke
c000c635b1
CR feedback
2015-09-27 15:31:11 -07:00
Ken Cooke
956d83c872
Size optimization of new resampler. Reduced size of precomputed tables by 8x. Even with 32x oversampling of the prototype filter, aliasing from Lagrange interpolation is (12+24/octave) = -132dB which is fine.
2015-09-25 21:28:48 -07:00
Ken Cooke
4a1458e152
Algorithmic optimization of new resampler. All common sample rates now use a rational mode that does direct FIR filtering instead of coefficient interpolation. Complexity reduced by 2x for mono, 1.5x for stereo.
2015-09-25 19:05:55 -07:00
Howard Stearns
9e001f0b4b
Merge pull request #5903 from AndrewMeadows/ik-repairs-006
...
enforce target rotation during IK calculations
2015-09-25 15:50:59 -07:00
Andrew Meadows
a97f556958
enforce IK target rotation
2015-09-25 15:13:57 -07:00
Eric Levin
135e2683a6
Merge pull request #5902 from ctrlaltdavid/particles-fixes
...
Particles fixes
2015-09-25 10:56:18 -07:00
Andrew Meadows
4f0bd08b62
Merge pull request #5900 from ZappoMan/batchOptimizations
...
more work on batch optimzation
2015-09-25 09:00:38 -07:00
Andrew Meadows
7822d58164
Merge pull request #5870 from howard-stearns/apostrophe
...
Apostrophe key resets animation state.
2015-09-25 08:50:19 -07:00
David Rowe
d233d3f81b
Fix particle emitter corner cases
2015-09-24 19:17:02 -07:00
David Rowe
629128c17f
Fix particle emit directions for point emitter
2015-09-24 19:16:28 -07:00
David Rowe
d063f3488d
Back out fromSpherical code addition
2015-09-24 19:14:26 -07:00
Brad Hefta-Gaub
85b2322acc
more work on batch optimzation
2015-09-24 17:11:14 -07:00
Brad Hefta-Gaub
8a8da58dfd
Merge pull request #5898 from kencooke/audio-src
...
Completely remove SOXR from cmake
2015-09-24 15:59:23 -07:00
Howard Stearns
266c69fc70
Disable the old-school Rig::inverseKinematics during reset.
2015-09-24 15:33:52 -07:00
Ken Cooke
629ee7b0c1
Completely remove SOXR from cmake
2015-09-24 15:12:10 -07:00
Howard Stearns
bdbd9ab69e
Merge pull request #5895 from AndrewMeadows/ik-repairs-005
...
allow head translation when using hand IK in 3rd person screenie mode
2015-09-24 14:12:05 -07:00
Andrew Meadows
59da684eb9
make IKTarget::setType() a one-liner
2015-09-24 13:15:03 -07:00
Brad Hefta-Gaub
19d30bb08b
Merge pull request #5890 from ctrlaltdavid/20691
...
Orient particles to face camera but not roll with it
2015-09-24 12:49:13 -07:00
Andrew Meadows
17e3e9394f
allow head translation for 3rd person screenie IK
2015-09-24 12:38:46 -07:00
Brad Hefta-Gaub
776acf2182
ignore gverb warnings
2015-09-24 09:07:43 -07:00
Brad Hefta-Gaub
5e82b9c433
more warning fixes
2015-09-24 08:26:56 -07:00
