Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-16 23:22:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33016 commits 75 branches 59 tags 1.2 GiB
Commit graph

13193 commits

Author SHA1 Message Date
Brad Hefta-Gaub
7c14f9ab93 Merge branch 'animationGroupSettings' of https://github.com/ZappoMan/hifi into animationGroupSettings 2015-09-30 21:46:28 -07:00
Brad Hefta-Gaub
06d77ecbea first cut at migrating animation settings into a property group 2015-09-30 21:35:43 -07:00
Brad Hefta-Gaub
d7ee41cc23 first cut at migrating animation settings into a property group 2015-09-30 21:25:03 -07:00
Brad Hefta-Gaub
9fc684edf0 first cut at migrating animation settings into a property group 2015-09-30 21:19:33 -07:00
Brad Hefta-Gaub
6aa9ef9910 first cut at migrating animation settings into a property group 2015-09-30 20:51:25 -07:00
Stephen Birarda
5da5bd47af add a missing rename for socket Q_ASSERT_X 2015-09-30 21:45:22 -04:00
samcake
0398f9429e fix the coo/texel blender mode for the case when color is black and the stereo issue 2015-09-30 18:39:13 -07:00
samcake
69c4075439 Fix the behavior when skybox color is black and skymap is available 2015-09-30 18:08:01 -07:00
samcake
d3d4775232 THe dataBuffer contining the properties of the skybox is now per instace and not static and shared so it's static from frames to frames 2015-09-30 17:54:20 -07:00
samcake
be9b244779 Fix the skybox color issue with background rendering when no texture is there 2015-09-30 17:21:52 -07:00
Brad Hefta-Gaub
066e25bb4a Merge pull request #5965 from hyperlogic/tony/avatar-lean-bug-fixes 
Bug fix for deriveBodyFromHMDSensor calculations
 2015-09-30 16:54:59 -07:00
Anthony J. Thibault
d993d39718 Bug fix for deriveBodyFromHMDSensor calculations 
The calculation that determined where the body position relative to the HMD
was incorrect, one of the components was in the wrong coordinate frame.

Now use the skeleton's bind pose to compute the proper avatar offsets for the eyes, neck and hips.
Use these offsets to calculate where the hips should be given a specific hmd position and orientation.

Also, added a bug fix for Rig, which would cause a -1 index deference when an avatar was missing
certain named joints, such as, "LeftEye", "Neck" and "Head".
 2015-09-30 16:28:33 -07:00
samcake
6b86f21491 Merge branch 'master' of https://github.com/highfidelity/hifi into calvin 2015-09-30 15:54:39 -07:00
samcake
75e858cd13 Putting together the stencil buffer for opaque vs background and using it for the backgroud render items 2015-09-30 15:54:03 -07:00
Ryan Huffman
b7cfc07748 Merge pull request #5957 from ZappoMan/fixSentPacketHistoryCrash 
fix possible crash from null coming from _sentPackets
 2015-09-30 15:12:09 -07:00
Brad Hefta-Gaub
9cf49597a6 fix possible crash from null coming from _sentPackets 2015-09-30 14:16:41 -07:00
Seth Alves
b34ea6ded4 store action lifetime as an expires integer 2015-09-30 13:46:23 -07:00
Seth Alves
06f7f92951 Merge branch 'master' of github.com:highfidelity/hifi into debug-grab 2015-09-30 13:09:47 -07:00
Seth Alves
7c6846c260 add lifetime and tag arguments to actions 2015-09-30 13:09:41 -07:00
Brad Hefta-Gaub
88f0c7017e Merge pull request #5953 from hyperlogic/tony/avatar-mixer-crash-fix 
Prevent taking a reference to a QUrl rvalue.
 2015-09-30 12:36:45 -07:00
Brad Hefta-Gaub
46e1a298c8 Merge pull request #5951 from huffman/cc-rng-fix 
Fix infinite recursion error with CC rng
 2015-09-30 12:36:35 -07:00
David Rowe
c56ac24602 Improve particle property interpolation 
Use Bezier interpolation instead of cubic so that values don't overshoot.
 2015-09-30 11:37:22 -07:00
Anthony J. Thibault
83c3f65b1f Prevent taking a reference to a QUrl rvalue. 2015-09-30 11:34:38 -07:00
Ryan Huffman
1e9593029c Fix infinite recursion error with CC rng 
On some std::random implementations tryin get a range [low, high) where
high < low will cause infinite recursion.
 2015-09-30 11:34:11 -07:00
Stephen Birarda
82ac0b1a27 use a mutable mutex to keep const-ness 2015-09-30 14:23:18 -04:00
Stephen Birarda
f7e7b07441 fix constness of SentPacketHistory in OEPS 2015-09-30 14:15:22 -04:00
Stephen Birarda
cc6b0adb7d guard insert/get in SentPacketHistory 2015-09-30 14:15:04 -04:00
Sam Gateau
e78f1521ab getting the stencil buffer in place 2015-09-30 09:24:36 -07:00
Sam Gateau
21c7b292bb Merge branch 'calvin' of https://github.com/samcake/hifi into calvin 2015-09-29 18:31:01 -07:00
samcake
dc3c9b48ea MOving forward on the background beeing drawn last 2015-09-29 18:28:20 -07:00
Ryan Huffman
b4ca03ac3f Merge pull request #5940 from ericrius1/polyLineFix 
Made polyline painting experience smoother- no more flickering
 2015-09-29 18:22:01 -07:00
ericrius1
1760720b2b added check for normals and vertices 2015-09-29 17:42:20 -07:00
Andrew Meadows
b192d0a9cd make neck IK target type same as head 2015-09-29 17:39:17 -07:00
ericrius1
5ce3b13a4c Fixed spacing issues 2015-09-29 17:31:02 -07:00
ericrius1
d1b016b483 untabbified lines 2015-09-29 16:38:21 -07:00
Anthony J. Thibault
5e2279ed4b AnimManipulator: Don't read defaultAbsPose.trans anim var. 
At the moment the manipulator only supports rotations.
 2015-09-29 16:37:43 -07:00
Eric Levin
614312f04f Update PolyLineEntityItem.cpp 2015-09-29 16:32:07 -07:00
Eric Levin
36be35a836 Update RenderablePolyLineEntityItem.cpp 2015-09-29 16:30:42 -07:00
Andrew Meadows
a052f5e125 remove commented out debug line 2015-09-29 16:21:08 -07:00
Seth Alves
58d98d3ce4 Merge pull request #5932 from howard-stearns/default-animation-and-quieter 
Set default animation and quiet state logging
 2015-09-29 16:12:28 -07:00
Andrew Meadows
cdae16e07b fix bug: IK attenuates fast underpose animations 2015-09-29 16:11:27 -07:00
David Rowe
e2bee8ec08 Fix particle radius, color, and alpha starts/finishes 2015-09-29 15:40:46 -07:00
ericrius1
e7834365f5 Made polyline painting experience smoother- no more flickering 2015-09-29 15:33:39 -07:00
Brad Hefta-Gaub
04115052b3 Merge pull request #5938 from samcake/calvin 
Fixing the lighting view matrix for stereo again
 2015-09-29 15:08:41 -07:00
samcake
1bd07b58c3 Fixing the lighting view matrix for stereo again 2015-09-29 14:40:37 -07:00
Brad Hefta-Gaub
00c32fc7cd Merge pull request #5924 from jherico/marge 
Support for accessing IPD in scripts
 2015-09-29 14:24:53 -07:00
Brad Davis
9b13aac37d PR comments 2015-09-29 14:23:56 -07:00
Seth Alves
d0a1e206ca Merge branch 'master' of github.com:highfidelity/hifi into transmit-joint-translation 2015-09-29 13:55:13 -07:00
Stephen Birarda
f4bc3f8e38 fix a timer leak, line width in PacketList 2015-09-29 16:35:24 -04:00
Howard Stearns
96e3c722ed Quiet once/second logging/updating of other people's default avatars. 2015-09-29 13:04:59 -07:00
Howard Stearns
745a59af1c Default animation is anim graph. 
Remove state change logging from animation graph state machine.
 2015-09-29 12:48:57 -07:00
samcake
840f92bd06 Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes 2015-09-29 10:54:09 -07:00
samcake
a9f6c93a2c merging 2015-09-29 10:53:56 -07:00
samcake
a7e3ec58b9 Merge pull request #5927 from ZappoMan/fixSkybox 
fix skybox not always loading when you haven't moved or if the texture is slow in loading
 2015-09-29 10:04:49 -07:00
Brad Hefta-Gaub
dccf121cd3 Merge pull request #5928 from jherico/homer 
Disabling vertex attrib format due to crashes
 2015-09-29 10:01:36 -07:00
Brad Davis
daf803e8ea Disabling vertex attrib format due to crashes 2015-09-29 09:52:41 -07:00
samcake
73b458c72e Cleaning the normal texture load path 2015-09-29 09:38:01 -07:00
Brad Hefta-Gaub
2040fb4507 fix skybox not always loading when you haven't moved or if the texture is slow in loading 2015-09-29 09:32:34 -07:00
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
Seth Alves
ddeed8b4ee code review 2015-09-29 06:51:24 -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
Seth Alves
874bded236 remove horizontal line-break comments 2015-09-28 18:14:12 -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
Seth Alves
a8b135b5ca fix material colors for OBJ models 2015-09-28 17:02:00 -07:00
Brad Davis
7b1c04512a Adding support for accessing IPD in scripts 2015-09-28 16:24:38 -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
Seth Alves
8f02ffb76a git rid of if branch with same code in either branch 2015-09-28 15:32:53 -07:00
Seth Alves
4179e4aa74 merge from upstream 2015-09-28 15:28:10 -07:00
Seth Alves
04eed64c7c fix bug in JointState::translationIsDefault 2015-09-28 15:26:32 -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
Seth Alves
50dd8eba45 Relay joint translations across network. Apply animation's root-joint translation to avatar. 2015-09-26 11:40:39 -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
Brad Hefta-Gaub
ba73acf3b4 Merge pull request #5843 from ctrlaltdavid/20681 
Replace point and vector particle emitter with spheroid emitter
 2015-09-24 08:19:49 -07:00
David Rowe
3d44fdfdf5 Fix warnings 2015-09-23 21:18:23 -07:00
Brad Hefta-Gaub
c6ac54b031 Merge pull request #5884 from sethalves/fix-obj-models 
get obj models to be visible again.  textures don't work
 2015-09-23 20:43:25 -07:00
Brad Hefta-Gaub
d14820d3ef Merge pull request #5880 from thoys/20668 
Worklist job #20668 - JS: Add option to listen audio from camera
 2015-09-23 20:40:32 -07:00
samcake
46e9c463fc Merge pull request #5885 from ZappoMan/batchOptimizations 
Batch optimizations
 2015-09-23 19:30:51 -07:00
Brad Hefta-Gaub
5a80c4d0e7 Merge pull request #5886 from samcake/calvin 
Expose multi Draw Indirect in Batch (Hijack Austin's work...)
 2015-09-23 19:13:28 -07:00
Brad Hefta-Gaub
432dc2055f gak 2015-09-23 17:38:59 -07:00
Brad Hefta-Gaub
9a0e5b9870 address Sam's concerns 2015-09-23 17:37:48 -07:00
samcake
8bdfc853d9 Merge branch 'orange' of https://github.com/samcake/hifi into hobbes 2015-09-23 17:31:04 -07:00
Brad Hefta-Gaub
62c1e40127 CR repairs 2015-09-23 17:15:29 -07:00
David Rowe
a2c7b3bcc9 Orient particles to face camera but not roll with it 2015-09-23 17:00:07 -07:00
Howard Stearns
14bfdebdca Merge pull request #5883 from hyperlogic/tony/lean-threshold 
Better Head IK when in HMD mode
 2015-09-23 16:57:02 -07:00
ZappoMan
65a079cb53 fix mac build 2015-09-23 16:48:34 -07:00
samcake
9c44c3e4a4 Removing warnings 2015-09-23 16:19:34 -07:00
samcake
5176d51714 Merge and fix warnings 2015-09-23 16:05:53 -07:00
samcake
370b41895c Merge branch 'master' of https://github.com/highfidelity/hifi into calvin 2015-09-23 16:03:10 -07:00
Brad Hefta-Gaub
24e2215f14 fix mac/unix build 2015-09-23 15:47:52 -07:00
Philip Rosedale
75a9dd13be Merge pull request #5872 from kencooke/audio-src 
New low-latency sample rate conversion library
 2015-09-23 15:42:53 -07:00
Anthony J. Thibault
6b47373bcb Fix for precision error in AnimPose(glm::mat4) constructor. 
Really the culprit is GLMHelpers extractRotation().
I have a separate unit test that demonstrates the bug.
 2015-09-23 15:38:56 -07:00
samcake
5fd2992c28 sometimes, magic happens, and clean rebuilds... 2015-09-23 15:34:49 -07:00
samcake
83116fdd85 Fixed the code path with tseparate vertex format, still broken otherwise in the case of primitive instanced 2015-09-23 15:20:39 -07:00
Seth Alves
27688fa55b get obj models to be visible again. textures don't work 2015-09-23 14:46:57 -07:00
Brad Hefta-Gaub
ef25876c9a implement vector caching for gpu::Batch 2015-09-23 14:46:47 -07:00
samcake
acfb5a32bc Rename the nb parameters with num 2015-09-23 12:28:46 -07:00
samcake
8735aa8003 Merging Austin pr that adds the multi draw indirect and also fix the seprate vertex format feature for windows and linux 2015-09-23 12:19:17 -07:00
Ken Cooke
478eab3843 CR feedback 2015-09-23 12:07:17 -07:00
Anthony J. Thibault
90a551214e Fix for AnimDebugDraw crash on shutdown. 2015-09-23 11:09:43 -07:00
Anthony J. Thibault
a454584496 Updated default avatar-animation.json 2015-09-23 10:59:52 -07:00
Anthony J. Thibault
a9848cd157 Merge branch 'master' into tony/lean-threshold 2015-09-23 10:54:12 -07:00
David Rowe
2b902238e7 Code tidying 2015-09-23 10:33:31 -07:00
samcake
7f8450f77b Merge branch 'master' of https://github.com/highfidelity/hifi 2015-09-23 10:30:51 -07:00
samcake
d7d332acd4 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 
t :wq
 2015-09-23 09:51:31 -07:00
David Rowe
eb01ba9812 Merge branch 'master' into 20681 2015-09-23 09:42:56 -07:00
Ken Cooke
c4bc5233b1 In AudioClient, replace all SOXR with AudioSRC. Used for input-to-network, network-to-output, and loopback resampling. 2015-09-22 23:10:03 -07:00
Ken Cooke
4b9c2ed6b6 In AudioInjector, replace SOXR with AudioSRC. 
Used for pitch shifting in playSound(). Setup time (once per sound) is drastically improved.
 2015-09-22 23:08:05 -07:00
Brad Hefta-Gaub
387c4fbd92 fix bad oglplus pragma warnings 2015-09-22 21:52:16 -07:00
Brad Hefta-Gaub
17a3fd159a apparently unix doesn't like the generic type version of sqrt() 2015-09-22 21:43:09 -07:00
Brad Hefta-Gaub
02e1de3ba3 more warnings fixes 2015-09-22 21:35:13 -07:00
Brad Hefta-Gaub
cd9aad4f41 more warnings fixes 2015-09-22 21:28:45 -07:00
Brad Hefta-Gaub
9436d2922f more warnings fixes 2015-09-22 21:18:04 -07:00
Brad Hefta-Gaub
5b00783f18 more warnings fixes 2015-09-22 20:54:36 -07:00
Brad Hefta-Gaub
8d8035a418 Merge branch 'master' of https://github.com/highfidelity/hifi into fixWarning 
Conflicts:
	libraries/render-utils/src/Model.cpp
	libraries/render-utils/src/Model.h
 2015-09-22 20:54:25 -07:00
Brad Hefta-Gaub
52842cb287 more warnings fixes 2015-09-22 20:34:40 -07:00
Anthony J. Thibault
9ce43a57f1 Better head IK when in an HMD. 
Because the current IK system doesn't quite handle what we need
for the head and neck IK, we do it procedurally in the rig, and
manually set both neck and head IK targets.
 2015-09-22 19:58:21 -07:00
Anthony J. Thibault
d04f4d4b2b Added shared DebugDraw singleton. 2015-09-22 19:57:23 -07:00
Anthony J. Thibault
d53295655f Fixes for empty poses 
This can happen when an animation is evaluated before it is finished loading.
 2015-09-22 19:54:51 -07:00
samcake
518f5fe17c Starting to clean the mesh part of the RenderItem.... 2015-09-22 18:21:36 -07:00
Brad Hefta-Gaub
e99ad75a28 more warnings fixes 2015-09-22 18:01:39 -07:00
Brad Hefta-Gaub
6f7e13b3c1 more warning fixes 2015-09-22 17:26:45 -07:00
Brad Hefta-Gaub
7536fed09a more warning fixes 2015-09-22 17:22:09 -07:00
Andrew Meadows
d25ba8946e fix animation attenuation from IK relaxation step 2015-09-22 17:20:26 -07:00
Andrew Meadows
2edffaf91a remove unused variables 2015-09-22 17:20:13 -07:00
Andrew Meadows
11fee94459 remove warning about signed/unsigned comparison 2015-09-22 17:19:47 -07:00
Brad Hefta-Gaub
efda121619 fix a bunch of warnings on windows 2015-09-22 16:40:17 -07:00
Brad Davis
deaa4a747b Batch side implementation of multi-draw indirect 2015-09-22 15:56:58 -07:00
Ken Cooke
0ad01ca935 Merge branch 'master' of https://github.com/highfidelity/hifi into audio-src 2015-09-22 15:33:13 -07:00
Brad Hefta-Gaub
5bcce50b98 Merge pull request #5846 from bob-long/master 
Display the face blend coefficients and update the value in real time.
 2015-09-22 14:56:56 -07:00
Andrew Meadows
084ba8abc0 Merge pull request #5874 from howard-stearns/AndrewMeadows-ik-repairs-003 
cleanup IK implementation plusplus
 2015-09-22 14:51:41 -07:00
Brad Hefta-Gaub
5bb908f081 remove dead code and fix warning 2015-09-22 12:34:47 -07:00
Ken Cooke
630abda35f Merge branch 'master' of https://github.com/highfidelity/hifi into audio-src 2015-09-22 10:18:11 -07:00
Howard Stearns
7e52d38870 Don't include the root rot, because it seems that this is already accounted for in the head params. 
Restore the hmd conditional on setting head position. This had been removed when failing to pin it cause lean.
I believe that lean was being caused by coordinate system issues that are now addressed by the above and Andrew's big cleanup.
 2015-09-22 10:12:59 -07:00
Howard Stearns
8f1dde69cc Always keep targets, even when both position and rotation are unset. (Get from underpose.) 
Filtering these was necessary before when the underpose coordinate was wrong, but now that we have that working, there shouldn't be any need to filter.
 2015-09-22 10:10:29 -07:00
Howard Stearns
0ccf2346fa Merge branch 'ik-repairs-003' of https://github.com/AndrewMeadows/hifi into AndrewMeadows-ik-repairs-003 2015-09-22 09:45:22 -07:00
Ken Cooke
b983ba7056 Fix Mac and Linux builds 2015-09-22 08:46:00 -07:00
Ken Cooke
2d1150115f New low-latency sample rate conversion library 2015-09-22 08:14:08 -07:00
Thijs Wenker
617f048883 Added JS interface to change audio listening position / orientation in Interface 
- MyAvatar.audioListenerMode  change using:   MyAvatar.FROM_HEAD    , MyAvatar.FROM_CAMERA , MyAvatar.CUSTOM
- MyAvatar.customListenPosition   and  MyAvatar.customListenOrientation are for manual listening positions
 2015-09-22 13:40:33 +02:00
samcake
80e5581639 fixing review comments 2015-09-21 22:51:14 -07:00
samcake
4513b64b00 fixing review comments 2015-09-21 22:42:24 -07:00
BOB LONG
a23a90bf5f Code simplification 
Simplify the code a bit as suggested:

1) Use unsigned int instead of signed int, so we can avoid checking the
negative case
2) Merge two lines into a single line so we can inline the
implementation

Correct the js sample file header.

testing done:
- Build locally
- Pass -1 as index from js and the code still can correctly handle the
input.
 2015-09-21 19:11:13 -07:00
samcake
91b9940fe9 Merging and a fix for the diffuse map floating around 2015-09-21 18:09:25 -07:00
Andrew Meadows
3869887610 splitting AnimNode implementation into two files 2015-09-21 17:53:59 -07:00
samcake
910038cf82 Merging 2015-09-21 17:47:23 -07:00
Andrew Meadows
e6776ef5eb split AnimIK::evaluate() into sub-functions 
also IK targets now in model-frame instead of root-frame
 2015-09-21 17:29:39 -07:00
samcake
21f53f1bbd debugging the lighting issue on the craps table 2015-09-21 16:57:55 -07:00
Brad Hefta-Gaub
ea141aae92 Merge pull request #5865 from jherico/bart 
Instancing work, second pass
 2015-09-21 16:51:08 -07:00
Brad Davis
483884196c Merge pull request #5866 from ZappoMan/mergeQuadsAndTriangles 
merge model part quads and triangles together to reduce the number of draw calls
 2015-09-21 16:48:29 -07:00
Bradley Austin Davis
0401672c82 Fixing lighting again 2015-09-21 16:24:55 -07:00
samcake
dfe17e5708 Fix issues from review 2015-09-21 16:12:17 -07:00
Bradley Austin Davis
b3aeaba5f4 CR feedback 2015-09-21 15:44:47 -07:00
samcake
a485d3d6de Fixing the rendering of ProceduralSkybox 2015-09-21 15:21:48 -07:00
Bradley Austin Davis
84cea1ffd4 More CR comments 2015-09-21 14:33:32 -07:00
samcake
fa9b0930d2 Bring back the procedural skybox 2015-09-21 14:25:32 -07:00
Bradley Austin Davis
0c0af812c2 CR comments 2015-09-21 14:16:56 -07:00
Bradley Austin Davis
e12e4ece34 Fixing lighting and atmosphere 2015-09-21 13:51:08 -07:00
Bradley Austin Davis
e024d23366 Instancing work, second pass 2015-09-21 13:27:02 -07:00
samcake
d3b1bcb86d Redistributing the files to create the model-networking lib and separate that from the redner-utils 2015-09-21 13:21:35 -07:00
Brad Hefta-Gaub
dc9c774eb5 merge model part quads and triangles together to reduce the number of draw calls 2015-09-21 13:09:43 -07:00
Brad Hefta-Gaub
b88c8e507b fix a couple of properties 2015-09-21 11:35:26 -07:00
samcake
2875cb99bb Fixing the compilation issue 2015-09-21 09:47:00 -07:00
samcake
6a714f405c Integrate the PR from ALessandro through a different Texture Type and a different TextureLoader to transform a bump map into a normal map 2015-09-21 00:53:48 -07:00
samcake
3614812681 MOving the actual creation of the texture and the pixel manipulation required from TextureCache to TextureSOurce 2015-09-20 23:31:59 -07:00
samcake
6914caac9d Renaming TextureStorage.x to TextureMap.x 2015-09-20 18:14:03 -07:00
samcake
d6d95ff86b Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-20 14:33:23 -07:00
samcake
a41c20a1b7 Fixing buggy hash map look up and cleaning of name 2015-09-20 14:17:55 -07:00
Brad Hefta-Gaub
ba5109c458 Merge pull request #5858 from howard-stearns/see-other-default-avatars 
Let other users see your default avatar.
 2015-09-20 13:57:29 -07:00
Howard Stearns
4fadf986e4 Merge pull request #5857 from hyperlogic/tony/look-whos-talking 
Talking idle animation support
 2015-09-20 13:46:40 -07:00
Howard Stearns
4d2048c6f6 Let other users see your default avatar. 
Fixes https://app.asana.com/0/26225263936266/51001490412567
 2015-09-20 13:12:13 -07:00
samcake
c9cb768945 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-19 09:00:19 -07:00
samcake
9a8dc6ca5d Fix compilation issues on mac 2015-09-19 08:59:47 -07:00
samcake
8941741508 Migrating the rendering code to the Material Maps and adding the simplae variables to the the TextutreMap 2015-09-18 18:47:18 -07:00
Anthony J. Thibault
eadf212418 Updated avatar.json with talking idle animation. 2015-09-18 18:31:53 -07:00
Brad Hefta-Gaub
ec87502f49 Merge pull request #5840 from jherico/bart 
Instanced rendering for Box entities
 2015-09-18 18:06:25 -07:00
Anthony J. Thibault
44eb448cbe Hooked up isTalking flag to Rig and AnimGraph. 2015-09-18 18:05:51 -07:00
David Rowe
812ab9b7c6 Merge branch 'master' into 20681 
Conflicts:
	libraries/entities/src/EntityItemProperties.cpp
 2015-09-18 16:44:04 -07:00
Philip Rosedale
5e64420ea1 Merge pull request #5850 from jherico/dargo 
Remove overcalling of glVertexAttrib4f
 2015-09-18 16:38:22 -07:00
Brad Davis
8a703d0363 Instanced rendering, first pass 2015-09-18 16:29:29 -07:00
Andrew Meadows
269e3d7f23 Merge pull request #5836 from ZappoMan/getEntityPropertiesPerformance 
Entities.getEntityProperty() performance improvements
 2015-09-18 15:19:06 -07:00
Bradley Austin Davis
f851c6204f Remove overcalling of glVertexAttrib4f 2015-09-18 15:14:04 -07:00
Brad Davis
2f0ba40347 Merge pull request #5844 from ZappoMan/cruftRemovalMachine 
Cruft removal machine
 2015-09-18 14:59:16 -07:00
Brad Hefta-Gaub
d2a468b31d Merge pull request #5845 from hyperlogic/tony/vive-controller-offset-fix 
Adjust controller offset from 6 inches to 3 inches
 2015-09-18 14:26:27 -07:00
Brad Hefta-Gaub
020fb25ace CR feedback 2015-09-18 14:24:01 -07:00
Seth Alves
26c14ab730 Merge pull request #5847 from ZappoMan/callEntityMethods 
fix grab behavior with toys, add better mechanism for toys to detect grab
 2015-09-18 14:21:59 -07:00
Brad Hefta-Gaub
0d37511071 add support for scripts to call methods on entity scripts 2015-09-18 14:06:38 -07:00
David Rowe
ec146069b1 Reuse old property enum slots 2015-09-18 13:06:18 -07:00
David Rowe
03194437f5 Merge branch 'master' into 20681 
Conflicts:
	examples/entityScripts/sprayPaintCan.js
 2015-09-18 12:04:02 -07:00
Brad Hefta-Gaub
416acb1d4a remove call to _entities.render() in displaySide() 2015-09-18 12:03:58 -07:00
Shared Vive Room
3c64db5c86 Adjust controller offset from 6 inches to 3 inches 
When using the vive controller the position of your wrist should
match your actual wrist a bit better, unless your name is Shaquille O'Neal.
 2015-09-18 12:02:05 -07:00
Andrew Meadows
07f3abfc91 fix bugs 2015-09-18 12:01:23 -07:00
samcake
64cf8590eb fix typos 2015-09-18 11:51:58 -07:00
samcake
5f5cc3dbaf fix typos 2015-09-18 11:51:28 -07:00
samcake
767407af9c Merging and cleaning shaders 2015-09-18 11:46:44 -07:00
Brad Hefta-Gaub
6edc817bf2 move the best zone logic out of EntityTreeRenderer::render() 2015-09-18 11:35:50 -07:00
samcake
d4fd2ea4c6 merging 2015-09-18 11:31:53 -07:00
Andrew Meadows
4cb2249cda premature optimization: remove another branch 2015-09-18 10:16:19 -07:00
Andrew Meadows
a85afb5280 simplify logic of RotationAccumulator::add() 2015-09-18 10:13:21 -07:00
Andrew Meadows
6ed0a57d9f avoid unecessary computation of last absolutePose 2015-09-18 10:09:23 -07:00
Andrew Meadows
9e94e7f1d0 less complicated RotationAccumulator 2015-09-18 07:11:36 -07:00
Sam Gateau
d0f7ddd3a6 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-18 00:03:19 -07:00
David Rowe
8634b59914 Make able to emit from within portion of ellipsoid volume 2015-09-17 23:49:57 -07:00
David Rowe
9e2b5b75b6 Make able to emit in specified range of directions 
Controlled by polar and azimuth start and finish angles, around point or
from specified part of spheroid surface.
 2015-09-17 22:40:49 -07:00
Andrew Meadows
b6a153d926 split RotationAccumulator into its own files 2015-09-17 22:30:44 -07:00
Andrew Meadows
420acde720 blend IK effects between distinct end effectors 2015-09-17 22:11:59 -07:00
Brad Hefta-Gaub
4a34b142d1 remove render element proxies 2015-09-17 22:05:14 -07:00
David Rowe
f647dcf147 Change emitter radiuses to dimensions to match sphere properties 2015-09-17 21:06:40 -07:00