Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-19 18:40:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
33636 commits 25 branches 0 tags 1.1 GiB
Commit graph

13604 commits

Author SHA1 Message Date
Atlante45
0aab013a0e Remove unused members 2015-10-06 13:56:20 -07:00
Atlante45
92e974929c Move tray icon to MainWindow 2015-10-06 13:56:19 -07:00
Atlante45
0f18db886c Remove 4 Application static methods 
- Replace by lambda
- Cleaned up global scope
 2015-10-06 13:56:19 -07:00
Atlante45
cf3b33a96b Replace Application::getInstance() with qApp 2015-10-06 13:56:19 -07:00
Thijs Wenker
4e8fc08458 made the changes as suggested by @hyperlogic 2015-10-06 20:48:51 +02:00
Thijs Wenker
3c6e9378c3 fixes merge issues 2015-10-06 20:20:37 +02:00
Thijs Wenker
953ff6caa7 Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation 
Conflicts:
	interface/src/Application.cpp
	interface/src/scripting/HMDScriptingInterface.h
	libraries/display-plugins/src/display-plugins/oculus/OculusHelpers.h
 2015-10-06 20:06:29 +02:00
Thijs Wenker
f6afb4cb02 Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation 
Conflicts:
	interface/src/scripting/HMDScriptingInterface.h
 2015-10-06 19:56:22 +02:00
Andrew Meadows
2c276bb13e Merge pull request #5986 from sethalves/kinematic-grab 
Kinematic grab
 2015-10-06 10:30:06 -07:00
Brad Davis
8090bc8e8d Revert "Enabling programmatic access to the IPD scale" 2015-10-06 10:16:42 -07:00
Seth Alves
8caa7abca6 assert that deltaTimeStep is always greater than zero 2015-10-06 09:35:54 -07:00
Seth Alves
5abaf38efd include setVelocity in returned arguments 2015-10-06 09:24:18 -07:00
Seth Alves
18b5b994b4 include setVelocity in returned arguments 2015-10-06 09:23:38 -07:00
Seth Alves
febdb52b26 Merge branch 'master' of github.com:highfidelity/hifi into kinematic-grab 2015-10-06 09:20:13 -07:00
Seth Alves
c3142ab90b include setVelocity in returned arguments 2015-10-06 09:20:07 -07:00
Seth Alves
91f5a6fec6 make setting of rigid-body velocity controlled by an action argument 2015-10-06 08:08:33 -07:00
Brad Hefta-Gaub
d95fe3ddb7 Merge pull request #5989 from jherico/homer 
Enabling programmatic access to the IPD scale
 2015-10-05 17:22:19 -07:00
Clément Brisset
5eda3095bb Merge pull request #5998 from birarda/qt-5.5 
suppress warnings for overriden methods in Xcode 7
 2015-10-05 17:00:43 -07:00
Thijs Wenker
dd59527763 Merge branch 'master' of https://github.com/worklist/hifi into js-hmd-position-orientation 2015-10-06 01:35:29 +02:00
Stephen Birarda
25a1f2dd11 add override to suppress warning for PluginContainerProxy 2015-10-05 15:53:37 -07:00
Stephen Birarda
a2c9d7a4b2 add overrides for Avatar classes in Interface 2015-10-05 15:52:47 -07:00
Anthony Thibault
2a406481d4 Merge pull request #5992 from howard-stearns/reset-on-calibration 
Reset (as though by apostrophe key) whenever we calibrate the hydra.
 2015-10-05 15:19:16 -07:00
Seth Alves
99be44f92d smooth out vibrating appearance for kinematic hold 2015-10-05 14:58:42 -07:00
Seth Alves
8f924f0be4 merge from upstream 2015-10-05 13:05:37 -07:00
Howard Stearns
844270e306 Reset (as though by apostrophe key) whenever we calibrate the hydra. 2015-10-05 12:44:22 -07:00
Andrew Meadows
1ead20683c Merge pull request #5976 from sethalves/fix-action-deletes 
Fix action deletion/addition when more than one interface are involved
 2015-10-05 12:31:01 -07:00
Seth Alves
993111d22f code review 2015-10-05 11:28:59 -07:00
Seth Alves
8c25f2e16c Merge branch 'master' of github.com:highfidelity/hifi into kinematic-grab 2015-10-05 09:09:01 -07:00
Brad Davis
725ed26ac2 Enabling programmatic access to the IPD scale 2015-10-04 16:55:49 -07:00
Thijs Wenker
8befade007 expose position and orientation of HMD to Javascript. 
- HMD.orientation
- HMD.position
 2015-10-04 15:08:35 +02:00
Seth Alves
6a770a870b set correct type in kinematic hold 2015-10-02 17:31:45 -07:00
Seth Alves
89c848d8c8 fix up kinematic hold 2015-10-02 17:14:53 -07:00
Howard Stearns
fdba55e56e Merge pull request #5973 from ctrlaltdavid/20698 
Fix Reload Content menu item not reloading FST files
 2015-10-02 16:43:11 -07:00
Seth Alves
cf8955a8c5 kinematic grab 2015-10-02 15:27:01 -07:00
Howard Stearns
f6665a4ac6 Merge pull request #5839 from sethalves/transmit-joint-translation 
WARNING protocol change: Transmit joint translation
 2015-10-02 13:37:56 -07:00
Anthony J. Thibault
c0be32d359 Fix for model offset when using Rig Animations. 2015-10-02 11:40:46 -07:00
Anthony J. Thibault
fc7b6dee84 Merge branch 'master' into transmit-joint-translation 2015-10-02 11:40:33 -07:00
Brad Hefta-Gaub
4c556dd43a Merge pull request #5962 from samcake/calvin 
Rendering the background elements after opaque and only work on the far pixels
 2015-10-02 11:38:45 -07:00
Brad Hefta-Gaub
c6c430ca76 Merge pull request #5977 from jherico/marge 
Fixing 2D overlay mouse interaction
 2015-10-02 11:11:04 -07:00
Anthony J. Thibault
a1b54945d6 Compute the model offset in the rig, using the bind pose of the hips. 2015-10-02 10:34:34 -07:00
Brad Davis
aa8979570c Working on 2D overlay mouse interaction 2015-10-02 00:35:37 -07:00
samcake
71ad6195f2 Merge branch 'master' of https://github.com/highfidelity/hifi into calvin 2015-10-01 19:25:25 -07:00
Anthony J. Thibault
fa864d29f9 Merge branch 'master' into transmit-joint-translation 2015-10-01 16:55:24 -07:00
Andrew Meadows
09ac01a5e7 remove cruft from old verlet avatar simulation 2015-10-01 13:44:50 -07:00
David Rowe
2fbb436bc5 Fix Reload Content menu item 2015-10-01 12:42:23 -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
Seth Alves
7c6846c260 add lifetime and tag arguments to actions 2015-09-30 13:09:41 -07:00
Brad Hefta-Gaub
76825c2be7 only show hand cursors when menu is enabled 2015-09-30 09:06:45 -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
Seth Alves
d554eb8db9 avatar collisions are off during a grab 2015-09-29 15:09:25 -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
Seth Alves
d0a1e206ca Merge branch 'master' of github.com:highfidelity/hifi into transmit-joint-translation 2015-09-29 13:55:13 -07:00
Seth Alves
f7b34f63c1 try calling updateMotionBehaviorFromMenu 2015-09-29 13:40:54 -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
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
7b1c04512a Adding support for accessing IPD in scripts 2015-09-28 16:24:38 -07:00
Seth Alves
89ab1f626f Merge pull request #5921 from huffman/import-export-fix 
Import/Export entities fix
 2015-09-28 16:21:18 -07:00
Howard Stearns
2e05ede524 Merge pull request #5920 from hyperlogic/tony/oculus-judder-fix 
Fix for Oculus timewarp judder introduced by 20d784ba39
 2015-09-28 15:57:47 -07:00
Anthony J. Thibault
c51ce79205 Updated comment on MyAvatar::updateFromHMDSensorMatrix() 2015-09-28 15:30:21 -07:00
Seth Alves
4179e4aa74 merge from upstream 2015-09-28 15:28:10 -07:00
Ryan Huffman
1a9cd59339 Fix ClipboardScriptingInterface to call methods on main app thread 2015-09-28 15:05:48 -07:00
Ryan Huffman
dde1c8b42f Fix use of EntityTree in import/export operations 
The EntityTree needs to be references by a shared_ptr somewhere.
The EntityTree does not start with a root element by default, which some
operations rely on to work as expected.
 2015-09-28 15:05:48 -07:00
Anthony J. Thibault
e32eb38c3b Fix for Oculus timewarp judder introduced by 20d784ba39 
Moved myAvatar->updateFromHMDSensorMatrix from Application::update
back into Application::paintGL, so it occurs between
displayPlugin->preRender() and displayPlugin->display().

We should render with the most up-to-date camera position as possible,
and sample it at the same frequency as the display rate.
 2015-09-28 14:38:03 -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 Hefta-Gaub
430cbcca7e first cut at adding surface normals to ray intersection 2015-09-27 21:57:50 -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
Seth Alves
50dd8eba45 Relay joint translations across network. Apply animation's root-joint translation to avatar. 2015-09-26 11:40:39 -07:00
Thijs Wenker
14fc39ffa3 Added JS access to the variables 
Stats.audioPacketlossUpstream
Stats.audioPacketlossDownstream
Which contain a floating point with the value between 0.0f and 1.0f which is the percentage of packet loss.
 2015-09-26 02:36:01 +02:00
Howard Stearns
a820682816 Merge pull request #5901 from hyperlogic/tony/gangsta-lean 
Threshold based walking/leaning while in HMD.
 2015-09-25 15:51:39 -07:00
Anthony J. Thibault
402573dbf1 Remove unused local 2015-09-25 14:11:33 -07:00
Thijs Wenker
9ed1397a63 Merge branch 'master' of https://github.com/worklist/hifi into 20672 2015-09-25 21:09:38 +02:00
Anthony J. Thibault
fc9b270951 Merge branch 'master' into tony/gangsta-lean 2015-09-25 11:36:58 -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
Anthony J. Thibault
474c847ef1 Updated constants and units. 2015-09-24 18:00:59 -07:00
Anthony J. Thibault
20d784ba39 Threshold based walking while in HMD. 
This is a blend of the previous 'sitting' and 'standing' HMD modes.
Basically, when you move your head within a small range (20cm) your
avatar will lean appropriately, however when you cross that threshold
your body will move underneath you, re-centering your head above the body.

While this occurs the avatar should play the appropriate walking animations.
 2015-09-24 17:54:32 -07:00
Brad Hefta-Gaub
85b2322acc more work on batch optimzation 2015-09-24 17:11:14 -07:00
Howard Stearns
266c69fc70 Disable the old-school Rig::inverseKinematics during reset. 2015-09-24 15:33:52 -07:00
Howard Stearns
426ccabba7 Merge branch 'master' of https://github.com/highfidelity/hifi into apostrophe 2015-09-24 14:19:58 -07:00
Thijs Wenker
6d4e4af0a5 ability to see Stats in JavaScript + example script which outputs the stats to the console/logviewer 2015-09-24 22:02:22 +02:00
Brad Hefta-Gaub
2eaeb26b2a fix GetVersionEx warning 2015-09-24 09:14:51 -07:00
Brad Hefta-Gaub
5e82b9c433 more warning fixes 2015-09-24 08:26:56 -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
9a0e5b9870 address Sam's concerns 2015-09-23 17:37:48 -07:00
ZappoMan
65a079cb53 fix mac build 2015-09-23 16:48:34 -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
Brad Hefta-Gaub
ef25876c9a implement vector caching for gpu::Batch 2015-09-23 14:46:47 -07:00
Anthony J. Thibault
0d7eae2d64 Fix slight translation error when rendering debug animation skeleton. 2015-09-23 11:42:55 -07:00
Anthony J. Thibault
90a551214e Fix for AnimDebugDraw crash on shutdown. 2015-09-23 11:09:43 -07:00
Anthony J. Thibault
a9848cd157 Merge branch 'master' into tony/lean-threshold 2015-09-23 10:54:12 -07:00
Howard Stearns
401f83135a Merge branch 'master' of https://github.com/highfidelity/hifi into apostrophe 2015-09-23 09:15:21 -07:00
Brad Hefta-Gaub
ec9bf0791b Merge pull request #5875 from ctrlaltdavid/20689 
Don't run Script Editor scripts from the cache
 2015-09-23 08:52:30 -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
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
Howard Stearns
a9460b9b41 Merge pull request #5881 from AndrewMeadows/ik-repairs-004 
remove underpose attenuation from IK relaxation step
 2015-09-22 19:45:40 -07:00
Brad Hefta-Gaub
e99ad75a28 more warnings fixes 2015-09-22 18:01:39 -07:00
Brad Hefta-Gaub
7536fed09a more warning fixes 2015-09-22 17:22:09 -07:00
Andrew Meadows
2edffaf91a remove unused variables 2015-09-22 17:20:13 -07:00
David Rowe
eda12fd3af Don't look straight ahead in fullscreen mirror 2015-09-22 16:15:54 -07:00
Howard Stearns
7bd395a4d4 Merge branch 'master' of https://github.com/highfidelity/hifi into apostrophe 2015-09-22 15:06:43 -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
3af1329be2 Merge pull request #5825 from thoys/20655 
CR for Job #20655 - Add ability to close one script from another script
 2015-09-22 14:52:39 -07:00
David Rowe
fed5e8e573 Don't run Script Editor scripts from the cache 2015-09-22 11:35:34 -07:00
Howard Stearns
c8960e23ec Merge branch 'master' of https://github.com/highfidelity/hifi into apostrophe 2015-09-22 10:55:26 -07:00
Andrew Meadows
7060befd1c Merge pull request #5862 from howard-stearns/user-specified-animation-graph 
user-specified animation graph
 2015-09-22 10:48:28 -07:00
Philip Rosedale
c09ac51d75 Merge pull request #5871 from ctrlaltdavid/20688 
DO NOT MERGE - QA for 20688 - Fix 3rd person HMD view
 2015-09-22 10:17:28 -07:00
Thijs Wenker
f38bb77d0a less calls to QHash 2015-09-22 18:48:46 +02:00
Thijs Wenker
90b89cbb45 Merge branch 'master' of https://github.com/worklist/hifi into 20655 2015-09-22 18:44:25 +02:00
Thijs Wenker
dfb9034b4e - delete new AudioListenerMode menu on script ending 
- style fix (function naming)
 2015-09-22 15:45:57 +02:00
Thijs Wenker
81932fe1d7 - added MyAvatar.audioListenerModeChanged signal , for registering changes. 
- updated the developerMenuItems.js script to include AudioListenerMode menu options under Developer > Audio
 2015-09-22 15:38:53 +02: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
4513b64b00 fixing review comments 2015-09-21 22:42:24 -07:00
David Rowe
30dc07b621 Code tidying 2015-09-21 21:22:36 -07:00
David Rowe
0f85c28098 Fix HMD 3rd person view 2015-09-21 21:08:13 -07:00
Howard Stearns
71b7f9ee38 Apostrophe key resets animation state. 2015-09-21 19:14:24 -07:00
samcake
910038cf82 Merging 2015-09-21 17:47:23 -07:00
Brad Davis
7b5cbbf758 Merge pull request #5868 from ctrlaltdavid/20687 
Fix HMD fullscreen mirror view
 2015-09-21 17:07:31 -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
samcake
a485d3d6de Fixing the rendering of ProceduralSkybox 2015-09-21 15:21:48 -07:00
Howard Stearns
4dd95be8c4 Forgot to actually persist. 2015-09-21 15:06:11 -07:00
David Rowe
46524632fe Fix eyeball directions in fullscreen HMD view 2015-09-21 14:18:33 -07:00
Bradley Austin Davis
0c0af812c2 CR comments 2015-09-21 14:16:56 -07:00
David Rowe
7ffde27224 Fix HMD fullscreen mirror view 2015-09-21 14:04:32 -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
43d96afc89 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-21 13:23:54 -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
Howard Stearns
237628e4cd Merge branch 'master' of https://github.com/highfidelity/hifi into user-specified-animation-graph 2015-09-21 11:24:25 -07:00
Howard Stearns
8b701b8a5b Provide a place in the advanced avatar section of preferences in which users can specify a different animation graph spec. 
Takes effect when you save (if you have enabled the anim graph under developer->avatar).
An empty string gives you the default behavior.
 2015-09-21 10:26:04 -07:00
Stephen Birarda
5ebc8d6036 fix for file upload to ATP on Windows 2015-09-21 10:24:11 -07:00
samcake
d6d95ff86b Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-20 14:33:23 -07:00
samcake
c9cb768945 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-19 09:00:19 -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
Anthony J. Thibault
44eb448cbe Hooked up isTalking flag to Rig and AnimGraph. 2015-09-18 18:05:51 -07:00
Brad Hefta-Gaub
416acb1d4a remove call to _entities.render() in displaySide() 2015-09-18 12:03:58 -07:00
Brad Hefta-Gaub
0ba1e8c945 remove renderingInWorldInterface signals 2015-09-18 09:49:57 -07:00
Sam Gateau
d0f7ddd3a6 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-18 00:03:19 -07:00
Seth Alves
da74d4b1e1 Merge pull request #5830 from ZappoMan/entityScriptsReload 
add reload all support for entity scripts
 2015-09-16 17:09:07 -07:00
Brad Hefta-Gaub
7840f122dc add reload all support for entity scripts 2015-09-16 16:46:46 -07:00
Anthony J. Thibault
5aeebba90e Renamed AnimController to AnimManipulator, Removed offsets on IK targets 2015-09-16 15:49:47 -07:00
Sam Gateau
d45547aa1a Merge and update 2015-09-16 13:46:07 -07:00
Atlante45
9678e70444 Asset caching 2015-09-16 15:17:15 +02:00
Atlante45
eabee9857a Enum coding standard 2015-09-16 15:17:14 +02:00
BOB LONG
efc321bc10 Display face blend coefficients 
Display the face blend coefficients and update the value in real time.
 2015-09-16 00:40:26 -07:00
Anthony J. Thibault
70f5835278 Updated left hand point and grab State Machine and animations 2015-09-15 18:00:13 -07:00
Thijs Wenker
9992f4b5c5 Made stopping scripts by hash (path/url) more tolerable and fixed stopping script functionality in ScriptDiscoveryService: 
made stopScript(string) to stop script by url or path and stopScriptName(string) to stop by filename
 2015-09-16 01:16:58 +02:00
Howard Stearns
848bb4fccb Merge pull request #5813 from hyperlogic/tony/anim-hand-state-machines 
Added point and grab support to the AnimGraph
 2015-09-15 15:47:19 -07:00
Anthony J. Thibault
f13c839f4a Removed comment 2015-09-15 15:19:11 -07:00
Anthony J. Thibault
1948829ca8 Improved state machine for right hand. 
The hand state machine has the following features

* There's a idle to point animation, followed by a looping point hold state.
* There's a point to idle animation.
* The grab state is composed of a linear blend between an open and closed pose.

Additionally the C++ code will ramp on the left and right hand overlays,
This allows the fingers to be animated normally when the user is not actively
pointing or grabbing.
 2015-09-15 15:09:08 -07:00
Brad Hefta-Gaub
54a45f3173 Merge branch 'master' of https://github.com/highfidelity/hifi into scriptEngineCleanup 
Conflicts:
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
 2015-09-14 21:13:08 -07:00
Brad Hefta-Gaub
94b273a029 more work on script engine 2015-09-14 20:59:10 -07:00
Brad Hefta-Gaub
a3c0288eae more work on proper threading of ScriptEngine 2015-09-14 20:26:04 -07:00
Anthony J. Thibault
90f46ba2c8 Added hand state machines to AnimGraph. 
* Application: Forward trigger values to the MyAvatar's PalmData
* SkeletonModel: Pass PalmData to Rig via updateRigFromHandData() this is more explicit then
  the Rig::inverseKinematics methods.
* AnimNodeLoader & AnimOverlay: add support for LeftHand and RightHand bone sets
* Rig::updateRigFromHandData() read the triggers and set stateMachine trigger vars
* avatar.json - udpated with new hand state machine with temporary animations
 2015-09-14 18:54:12 -07:00
Brad Davis
d7a850d7be Merge pull request #5638 from MarcelEdward/hifi-3DConnexion-cmake-fix 
Hifi 3 d connexion cmake fix
 2015-09-14 18:53:39 -07:00
MarcelEdward
64a8f7ebb4 Update 3DConnexionClient.h 2015-09-15 00:30:11 +02:00
Stephen Birarda
8308dbf4a3 Merge pull request #5787 from huffman/cleanup-asset-requests-on-node-kill 
DO NOT MERGE: Cleanup asset requests on node kill
 2015-09-14 13:08:01 -07:00
Ryan Huffman
71456eee5e Add UploadDialog error for NetworkError 2015-09-14 11:19:47 -07:00
Sam Gateau
3f2609e52a merging 2015-09-14 09:59:04 -07:00
Seth Alves
414d9162ef change type of MAX_LOG_SIZE rather than cast its only use 2015-09-14 08:47:14 -07:00
Seth Alves
49ee251238 quiet compiler 2015-09-12 09:59:25 -07:00
Brad Hefta-Gaub
f85cb2c888 first cut at cleaning up ScriptEngine class 2015-09-11 19:12:09 -07:00
Seth Alves
e65ef93663 Merge pull request #5778 from jherico/homer 
Fixing some entity race condition crashes
 2015-09-11 17:54:53 -07:00
Howard Stearns
4ffe2d0747 Merge pull request #5786 from AndrewMeadows/ik-with-constraints 
inverse kinematics works with rotation constraints
 2015-09-11 17:34:50 -07:00
Andrew Meadows
9c6060160a Merge pull request #5784 from howard-stearns/rationalize-rig-settings 
Rationalize rig settings
 2015-09-11 16:56:44 -07:00
Brad Davis
9b81842850 Merge branch 'master' into homer 
Conflicts:
	assignment-client/src/octree/OctreeSendThread.cpp
	interface/src/Application.cpp
	libraries/entities-renderer/src/EntityTreeRenderer.cpp
	libraries/entities/src/EntityItem.cpp
	libraries/entities/src/EntityTree.cpp
	libraries/entities/src/EntityTreeElement.cpp
	libraries/entities/src/EntityTreeElement.h
	libraries/entities/src/EntityTreeHeadlessViewer.cpp
	libraries/entities/src/RecurseOctreeToMapOperator.cpp
	libraries/octree/src/Octree.h
	libraries/physics/src/EntityMotionState.cpp
 2015-09-11 16:31:18 -07:00
Andrew Meadows
e85cdad8c7 remove DependencyManager fetch of backpointer 2015-09-11 16:27:50 -07:00
Brad Davis
e458eb7ae9 Merge pull request #5734 from sethalves/octree-shared-pointers 
octree uses shared pointers
 2015-09-11 16:00:04 -07:00
Andrew Meadows
c589f0e58e fix logic around rendering of hand targets 2015-09-11 13:42:17 -07:00
Andrew Meadows
ebadebbc87 render wireframe sphere for debug finger tip 2015-09-11 13:22:11 -07:00
Andrew Meadows
5296ddade9 remove unused menu item 2015-09-11 13:22:11 -07:00
Andrew Meadows
8d5106b072 improved debug render of hand coordinates 
also cleaned up includes in Hand.h
 2015-09-11 13:22:11 -07:00
Howard Stearns
f8f2a067a1 whitespace 2015-09-11 12:59:07 -07:00
Sam Gateau
5cc5609e87 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-11 12:05:02 -07:00
Howard Stearns
02fba12a48 Merge branch 'master' of https://github.com/highfidelity/hifi into rationalize-rig-settings 2015-09-11 11:53:19 -07:00
Howard Stearns
67ce0966d1 Rationalize the rig state setters. 2015-09-11 11:52:20 -07:00
Brad Davis
7fecd3261d Fixing bad merge 2015-09-11 11:40:57 -07:00
Brad Davis
244795b629 Merge branch 'homer' into temp 
Conflicts:
	interface/src/Application.cpp
 2015-09-11 11:21:29 -07:00
Seth Alves
218225e4a5 Merge pull request #5781 from hyperlogic/tony/head-ik 
Added head target to AnimGraph IK node.
 2015-09-11 10:58:53 -07:00
Sam Gateau
c9ec65fd65 Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2015-09-11 09:51:43 -07:00
Anthony J. Thibault
7996a02bd8 Added head target to AnimGraph IK node. 
* In HMD mode head orientation and position is set.
* When not in HMD only orientation is set, position should
  default to the underlying pose position.
 2015-09-11 09:48:48 -07:00
Stephen Birarda
a286f4e7d0 Merge pull request #5772 from Atlante45/protocol 
Asset server node JSON stats
 2015-09-11 09:35:39 -07:00
Ryan Huffman
9ab603e9a5 Merge pull request #5773 from birarda/master 
fail asset request if hash does not match
 2015-09-11 09:09:56 -07:00
Atlante45
449d6a04d8 CR 2015-09-11 14:21:56 +02:00
Atlante45
42d1ab3745 Remove accidentally added header 2015-09-11 14:21:55 +02:00
Atlante45
5808658958 Make NodeJSONStats reliable 2015-09-11 14:21:53 +02:00
Brad Davis
e9edbb9dd1 Can't promote readlock to writelock 2015-09-10 22:52:40 -07:00
Brad Davis
92eeb564fe PR comments 2015-09-10 20:57:43 -07:00
Brad Davis
aa989c3687 Fixing some entity race condition crashes 2015-09-10 20:53:17 -07:00
Brad Davis
3bc9e8c98d Fixing some entity race condition crashes 2015-09-10 20:43:41 -07:00
Sam Gateau
c37cdce750 Merging back with master 2015-09-10 17:53:50 -07:00
Howard Stearns
0870c5ed87 Merge pull request #5768 from hyperlogic/tony/ik-and-controllers 
AnimInverseKinematics and AnimController node
 2015-09-10 15:38:53 -07:00
Stephen Birarda
973fd80c1d fail asset request if hash does not match 2015-09-10 15:24:37 -07:00
David Rowe
4aa553c183 Stop DDE and EyeTracker early but don't destroy until later in shutdown 2015-09-10 14:53:56 -07:00
Anthony J. Thibault
3149baeefc Merge branch 'master' into tony/ik-and-controllers 2015-09-10 11:04:31 -07:00
Anthony J. Thibault
68076ccf45 updated anim graph url to use ik-avatar.json 2015-09-10 10:57:30 -07:00
Andrew Meadows
35b894872d Merge pull request #5753 from ctrlaltdavid/20671 
Terminate DDE earlier during shut-down and always at start-up
 2015-09-10 07:46:53 -07:00
David Rowe
fdcfa9657c Rework and clarify stopping an existing DDE process 2015-09-09 21:06:50 -07:00
Brad Hefta-Gaub
f29bcd8b6a Merge pull request #5755 from jherico/lisa 
Fix possible hang when switching out of Oculus mode
 2015-09-09 19:24:00 -07:00
Howard Stearns
da6444a776 Start anim graph in the right saved state on startup. 2015-09-09 17:02:55 -07:00
Howard Stearns
bcf16e52af Merge branch 'master' of https://github.com/highfidelity/hifi into animGraph-cleanup 2015-09-09 16:04:15 -07:00
Howard Stearns
5e8fe29674 Remove unused declaration. 2015-09-09 15:09:06 -07:00
Howard Stearns
c1d68e058e Reduce interconnection between AnimGraph and SkeletonModel by removing init and having MyAvatar:initAnimGraph go directly to rig (just like destroyAnimGraph does). 2015-09-09 15:02:11 -07:00
Brad Davis
382de2b4aa Fix possible hang when switching out of Oculus mode 2015-09-09 14:09:01 -07:00
Howard Stearns
ed2ed525b2 Tear down animGraph when turning off the avatar update thread. Otherwise, big time deltas accumulate. 2015-09-09 12:15:48 -07:00
David Rowe
01d7e68dbb Terminate DDE earlier during shut-down and always at start-up 2015-09-09 11:29:57 -07:00
Howard Stearns
3f5744712f Remove optional "parent" argument. 
GenericThread used to accept an optional "parent" argument, defaulting to nullptr.
This was odd, because the moveToThread() in GenericThread::initialize() would
become a no-op if the instance ever inits QObject(someNonNullParentQObject).
(The only clue would be a log message "QObject::moveToThread: Cannot move objects with a parent",
 and things would end up in the same thread that created the instance.)
As it turns out, all the subclasses of GenericThread do not init
GenericThread(parent), so things worked as expected.
 2015-09-09 11:04:17 -07:00
Howard Stearns
5572840133 Convert isHMD reference. 2015-09-09 10:39:36 -07:00
Howard Stearns
73a5714d66 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-09 10:37:11 -07:00
Howard Stearns
f081631075 Explicit cast. 2015-09-09 10:36:52 -07:00
Howard Stearns
24f1387579 Consistently use brace initialization in class headers. 2015-09-09 10:34:08 -07:00
Howard Stearns
f818ac2b74 Merge pull request #5744 from hyperlogic/tony/enable-lean-flag 
Added a flag to enable and disable lean.
 2015-09-09 10:18:12 -07:00
Howard Stearns
74c92af8e0 Merge pull request #5741 from AndrewMeadows/brokenCapsules 
fix for bad bounding capsules for avatars
 2015-09-09 09:33:57 -07:00
Anthony J. Thibault
75ecf0020d WIP commit, added AnimController node. 2015-09-08 20:34:21 -07:00
Seth Alves
9c4fdfd653 merge from upstream 2015-09-08 18:01:07 -07:00
Andrew Meadows
614c0be59a HACK so legless avatars don't drag their knuckles 2015-09-08 17:09:37 -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
Howard Stearns
eb67254e54 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-08 16:54:14 -07:00
Anthony J. Thibault
387d50c217 Added a flag to enable and disable lean. 
This should help improve our idle and walk animations, because
animation on the "lean" joint was being lost, even when we did
not require procedural leaning.
 2015-09-08 16:35:06 -07:00
Howard Stearns
2c856e4b08 Work around animation cache misbehavior wrt threads. 2015-09-08 16:22:06 -07:00
Howard Stearns
26f63a44fc Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-08 15:30:22 -07:00
Andrew Meadows
281e4f21fc fix avatar bounding capsule calculations 2015-09-08 15:03:12 -07:00
Howard Stearns
27f4bca0a4 Cleanup: This appears to be complete and working -- EXCEPT for loading animations on the update thread! 
Until I figure that out, the answer is to turn off Developer->Avatar->"Enable Avatar Update Threading", run through forward/back/left/right/strafeLeft/strafeRight, and then turn "Enable Avatar Update Threading" back on.
 2015-09-08 14:49:58 -07:00
Seth Alves
31fcd55d47 octree uses shared pointers 2015-09-08 11:59:48 -07:00
Stephen Birarda
25aeda2e18 Merge branch 'master' of https://github.com/highfidelity/hifi into protocol 2015-09-08 08:40:51 -07:00
Howard Stearns
d472fd66ff Cleanup. 2015-09-07 17:26:22 -07:00
Howard Stearns
efeaf21305 Checkpoint smoother. 2015-09-07 16:32:51 -07:00
Howard Stearns
0065c64b31 Snapshot of no-judder, before cleanup. 2015-09-07 09:57:05 -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
David Rowe
6923e3ce70 Fix logging of intentionally crashing Interface 2015-09-06 16:28:55 -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
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
Brad Hefta-Gaub
b63e15f2e9 fix a bug in bad PPS calculation 2015-09-04 15:06:56 -07:00
Howard Stearns
d3106de7c1 Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-04 14:32:58 -07:00
Howard Stearns
086afc47b1 Avatar animations on by default. (Using the now old animation machinery.) 
Default robot avatar consistent with the animations.
Don't require all the bones to be present.
 2015-09-04 14:24:37 -07:00
Stephen Birarda
ed19987b7d resolve conflicts on merge with upstream/master 2015-09-04 12:31:46 -06:00
Anthony J. Thibault
5882ec02d0 Merge branch 'master' into ajt/new-anim-system 2015-09-04 11:05:29 -07:00
Seth Alves
8c3bea6d0d Merge pull request #5713 from AndrewMeadows/flerovium 
fix collision shape of avatars
 2015-09-04 09:37:17 -07:00
Anthony J. Thibault
df28c7bf1a Merge branch 'master' into ajt/new-anim-system 2015-09-04 09:27:02 -07:00
Brad Hefta-Gaub
20bd14c8db Merge pull request #5684 from rabedik/fxaa 
Post-process anti-aliasing effect
 2015-09-04 09:01:39 -07:00
Brad Hefta-Gaub
2eb3d90ac2 Merge pull request #5708 from howard-stearns/new-default-avatar-collision-sound 
Change default avatar collision sound
 2015-09-04 08:48:30 -07:00
Brad Davis
c8069ba73c Working on magballs polish 2015-09-03 20:09:54 -07:00
Howard Stearns
c0fec44f32 Menu item to switch between threaded and not (without restart!). 2015-09-03 19:34:25 -07:00
Anthony J. Thibault
3716d5612b Merge branch 'master' into ajt/new-anim-system 2015-09-03 19:20:06 -07:00