Anthony J. Thibault
c1d7287652
AnimController node now takes absolute rotation vars, instead of relative.
2015-09-09 12:24:32 -07:00
Anthony J. Thibault
146836452f
Merge remote-tracking branch 'andrew/europium' into tony/ik-and-controllers
2015-09-09 09:40:55 -07:00
Anthony J. Thibault
39aef6edc9
AnimController fix for crash if underPoses vector was empty.
2015-09-08 21:42:42 -07:00
Anthony J. Thibault
75ecf0020d
WIP commit, added AnimController node.
2015-09-08 20:34:21 -07:00
Andrew Meadows
e86e760118
remove debug stuff and nerfed constriants
2015-09-08 19:14:31 -07:00
Andrew Meadows
381828dac3
remove hackery for bad length units in AnimSkeleton
2015-09-08 19:02:16 -07:00
Andrew Meadows
ee265aba4a
add AnimInverseKinematics class
2015-09-08 18:20:22 -07:00
Andrew Meadows
3d661095dc
fix some bugs in RotationConstraints
2015-09-08 18:20:03 -07:00
Andrew Meadows
b6cef3d1a9
fix Qt includes
2015-09-08 18:19:33 -07:00
Andrew Meadows
00c446d1b0
sort includes
2015-09-08 18:19:18 -07:00
Andrew Meadows
c3e16d33c1
add InverseKinematics type
2015-09-08 18:18:50 -07:00
Seth Alves
e06461ea15
Merge pull request #5724 from hyperlogic/tony/anim-debug-draw-improvements
...
AnimDebugDraw Improvements
2015-09-08 17:07:51 -07:00
Stephen Birarda
a3feff1bd4
put DomainServerConnectionToken back in NON_SOURCED
2015-09-08 16:19:15 -07:00
Stephen Birarda
c670c9a0d5
fix for AnimNodeLoader use of Resource loaded
2015-09-08 15:31:37 -07:00
Stephen Birarda
e1a31f4dbe
put back TextureCache headers
2015-09-08 15:23:26 -07:00
Stephen Birarda
a3959109f1
resolve conflicts on merge with upstream/master
2015-09-08 15:18:39 -07:00
Brad Hefta-Gaub
152a86b0e9
Merge pull request #5735 from hyperlogic/tony/no-particle-fix
...
Fix for RenderableParticleffectEntityItem assert.
2015-09-08 15:13:38 -07:00
Brad Hefta-Gaub
8185a8da7f
Merge pull request #5732 from jherico/selma
...
Procedural skyboxes
2015-09-08 15:12:59 -07:00
Stephen Birarda
e1c395f5ea
resolve conflicts on merge with upstream/master
2015-09-08 14:56:23 -07:00
Stephen Birarda
b8bf9a1104
fix OBJReader loading with URL
2015-09-08 14:51:51 -07:00
Brad Davis
5f1affaff9
Procedural skybox work
2015-09-08 14:31:16 -07:00
Stephen Birarda
e0a8469354
fix for sequence point warning
2015-09-08 13:42:52 -07:00
David Rowe
2325cb8ee0
Merge branch 'master' into 20669
2015-09-08 13:26:20 -07:00
David Rowe
99c1e06201
Code tidying
2015-09-08 13:25:15 -07:00
Anthony J. Thibault
c728cd4c4c
Fix for RenderableParticleffectEntityItem assert.
...
When a particle system had no living particles, PendingChanges::updateItem
would assert, due to the access to _vertices[0]. In release this might be
harmless as this memory is never accessed, but different implementations of
std::vector might do different things here. So, let's be safe and early
return when the number of particles is 0.
2015-09-08 12:03:41 -07:00
Stephen Birarda
9a8bd607b5
Merge pull request #5729 from rudi-c/build_docs_and_fixes
...
Build docs and dependency fixes
2015-09-08 11:29:15 -07:00
David Rowe
cdd5e68815
Add colorStart and colorFinish entity particle properties
2015-09-08 11:28:53 -07:00
Anthony J. Thibault
6d5927c0c9
Now with less copies.
...
* AnimSkeleton now returns AnimPoses by const ref.
* AnimDebugDraw: uses references to Poses on the stack instead of copies
within inner loops.
* AnimDebugDraw: Removed unnecessary universal refs in range based for loops.
2015-09-08 10:51:23 -07:00
Stephen Birarda
9878143661
repairs to ShaderCache for Resource changes
2015-09-08 08:58:35 -07:00
Stephen Birarda
25aeda2e18
Merge branch 'master' of https://github.com/highfidelity/hifi into protocol
2015-09-08 08:40:51 -07:00
Stephen Birarda
c49088846f
add an alias for AvatarDataSequenceNumber
2015-09-08 08:26:14 -07:00
Brad Davis
743d79335d
Procedural shaders V2
2015-09-07 17:37:45 -07:00
David Rowe
cb9468c311
Add colorSpread entity particle property
2015-09-07 16:27:42 -07:00
James B. Pollack
670c5ee484
Merge pull request #5723 from jherico/lisa
...
Toggle mute while holding the hydras
2015-09-06 21:45:47 -07:00
Rudi Chen
b703ce01fb
Make sure libdl is linked after libcrypto.
...
Fixes a `undefined reference to symbol 'dlclose@@GLIBC_2.2.5' error
I was running into on Linux Mint 17.2.
2015-09-06 21:42:02 -04:00
David Rowe
16346dd717
Fix some build warnings
2015-09-06 16:20:46 -07:00
David Rowe
47b27a3280
Add alphaStart and alphaFinish entity particle properties
2015-09-05 16:30:01 -07:00
David Rowe
042384b5b0
Tidy and finish alpha and alphaSpread
2015-09-05 14:51:48 -07:00
David Rowe
1b3d125cb3
Add alphaSpread entity particle property
2015-09-05 14:39:10 -07:00
Brad Hefta-Gaub
1df3a8f814
Merge pull request #5727 from jherico/marge
...
Procedural rendering for box & sphere entities
2015-09-05 12:43:21 -07:00
Brad Davis
c4b1e6ecd3
Reducing debug spam
2015-09-05 12:22:25 -07:00
Brad Davis
9289a46112
Guarding against frequent userdata calls with no change.
2015-09-05 12:20:28 -07:00
Brad Davis
e8435b6218
Procedural rendering for box entities
2015-09-05 12:10:45 -07:00
David Rowe
8b296f53e6
Short-circuit radius values and interpolation when can
2015-09-05 11:13:48 -07:00
David Rowe
8d85309925
Use cubic interpolation instead of cosine
2015-09-05 10:50:05 -07:00
David Rowe
12b8a5a1d5
Add alpha property support to ParticleEffect entities
...
Add at same "level" as color so that it's available for other entity
types to use in the future.
2015-09-05 10:23:27 -07:00
Anthony Thibault
083c5b6738
Merge pull request #5721 from howard-stearns/default-avatar-for-animations
...
avatar animation defaults
2015-09-04 17:06:53 -07:00
Brad Davis
644e81e20b
Toggle mute while holding the hydras
2015-09-04 16:19:58 -07:00
Anthony J. Thibault
bb5d061d78
linux and mac compile fixes.
...
Removed "friend MyAvatar" from Rig and JointState.
This was only there for debugging, but I accidentally committed it.
2015-09-04 16:17:35 -07:00
Anthony J. Thibault
69e463bbfd
AnimDebugDraw Improvements
...
* Now always works, regardless of whether or not Rig or AnimGraph animations
are enabled.
* Changed joint radius to 1 cm.
* Changed xyz axis length to 4 cm.
2015-09-04 16:01:05 -07:00
