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

878 commits

Author SHA1 Message Date
Andrew Meadows
0e1e5db7eb only need one animateScaleChanges() implementation 2015-12-15 18:18:08 -08:00
Andrew Meadows
9b0c199ed7 updateAvatarPhysicsShape-->addAvatarToSimulation 2015-12-15 18:18:08 -08:00
Andrew Meadows
bab07516f0 fix size of rendered bounding capsule 2015-12-15 18:18:08 -08:00
Andrew Meadows
33634cdaa1 properly delete departing avatars 2015-12-15 18:18:08 -08:00
Andrew Meadows
e9f52b1211 properly scale avatar collision shape 2015-12-15 18:18:08 -08:00
Seth Alves
a3631ea1d1 Merge branch 'master' of github.com:highfidelity/hifi into near-grab-via-parenting 2015-12-15 10:12:49 -08:00
Anthony J. Thibault
3f0cdb3c02 Merge branch 'master' into tony/js-avatar-default-pose 2015-12-14 11:19:24 -08:00
Brad Hefta-Gaub
be058398a2 remove blue sphere while speaking 2015-12-13 12:02:39 -08:00
Seth Alves
6c033d9603 call locationChanged when receiving changing avatar joints over the network. RenderableModelEntityItem uses locationChanged to relay updates to _model 2015-12-11 11:35:42 -08:00
Anthony J. Thibault
652ce5501f Expose Avatar default pose to JavaScript 
New JavaScript API to get the avatar's default pose.

   MyAvatar.getDefaultJointRotation(index);
   MyAvatar.getDefaultJointTranslation(index);

See `examples/tPose.js` for example usage
 2015-12-10 13:57:31 -08:00
Atlante45
739e184b52 Fix attachments jitter 2015-12-10 11:19:11 -08:00
Seth Alves
f99812a903 adjust method names to fit convention 2015-12-07 14:31:08 -08:00
Seth Alves
fff4e3e831 make SpatiallyNestable setters take values by reference 2015-12-06 12:01:30 -08:00
Seth Alves
a948ae5f19 children of avatar joints might be right, now 2015-12-06 10:48:00 -08:00
Seth Alves
9a80c4d681 call locationChanged on children of joints when joints change 2015-12-06 05:43:23 -08:00
Anthony J. Thibault
7abfc93ff9 Avatar::getJointRotation and getJointTranslation is thread-safe 
It can be called from script with minimal blocking,
because it inspects a copy of the joint values from the Rig, which is updated atomically.
This copy occurs in Rig::updateAnimations()
 2015-12-04 16:16:17 -08:00
Brad Hefta-Gaub
0ad4efeeb9 Merge pull request #6555 from howard-stearns/remove-unimplemented-collision-shapes-menu-item 
Remove unimplemented collision menu items
 2015-12-04 11:25:08 -08:00
Howard Stearns
cb67f05103 Remove unimplemented menu items Developer->Avatar->Show Skeleton/Head Collision Shapes. 2015-12-04 10:47:27 -08:00
Seth Alves
f18fc84c2d fix debug build 2015-12-02 10:46:10 -08:00
Seth Alves
b7ebe5b92b merge from upstream 2015-11-30 16:59:52 -08:00
Seth Alves
cf39cac7fc attempt to make SpatiallyNestable data access thread-safe 2015-11-29 12:50:33 -08:00
Seth Alves
ca75802b9c unmangle merge 2015-11-26 06:43:28 -08:00
Anthony J. Thibault
7c9cb97783 Merge branch 'master' into tony/remove-joint-states 2015-11-25 15:48:51 -08:00
Howard Stearns
6c7099a5f7 Coordinate with other uses of setVisibleInScene. 2015-11-25 15:18:32 -08:00
Anthony J. Thibault
23def8d173 Merge branch 'master' into tony/remove-joint-states 2015-11-25 13:55:23 -08:00
howard-stearns
546f09c0b1 Restore rendering of one's own avatar. 2015-11-25 13:30:54 -08:00
Anthony J. Thibault
868cf83b48 Fix for attachments and MyAvatar::getDefaultEyePosition() 2015-11-25 10:07:29 -08:00
Andrew Meadows
bc20b72645 Merge pull request #6453 from howard-stearns/avatar-render-controller2 
Survive Flash Mobs Without Making Everyone Sick
 2015-11-25 09:52:28 -08:00
Anthony J. Thibault
f120e10ff4 Merge branch 'master' into tony/remove-joint-states 2015-11-24 15:00:05 -08:00
Brad Davis
64ba5b4f14 Cleaning up old recording files 2015-11-23 09:42:34 -08:00
Anthony J. Thibault
821264a031 Merge branch 'master' of github.com:highfidelity/hifi into tony/remove-joint-states 2015-11-22 16:15:03 -08:00
Seth Alves
f013f95e9b merge from upstream 2015-11-21 08:43:00 -08:00
Anthony J. Thibault
cb89f09635 Removed EntityRig and AvatarRig. One Rig to rule them all. 2015-11-20 14:27:01 -08:00
Howard Stearns
9673133bf4 whitespace (reduce diffs) 2015-11-20 14:26:37 -08:00
Anthony J. Thibault
a77ea8da43 Removed JointStates! You won't be missed. 2015-11-20 14:15:37 -08:00
howard-stearns
1ddcc62db9 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-render-controller2 2015-11-20 14:05:40 -08:00
Anthony J. Thibault
ad4b8e0001 Avatar transmission fixes, moved JointData into shared 
* Moved JointData into shared library
* added methods to the rig to copy into and out of JointData
* JointData translations must be in meters this is so the
  fixed point compression wont overflow, also, it's a
  consistent wire format.
 2015-11-20 10:24:24 -08:00
Stephen Birarda
5140a480a1 fix for recursive write then read lock 2015-11-19 15:35:41 -08:00
Howard Stearns
f6286201f4 cleanup 2015-11-19 11:55:22 -08:00
Howard Stearns
7d30cd0159 checkpoint: it works! 2015-11-19 09:18:40 -08:00
Howard Stearns
fee13d4375 Rebuild on a new branch after original stopped building. 2015-11-17 20:06:25 -08:00
Seth Alves
60824a1fb0 back out some off-brand changes. add parentChanged call 2015-11-03 16:07:28 -08:00
Seth Alves
dba9eb7046 merge from upstream 2015-11-03 13:35:17 -08:00
Brad Davis
4c076d8b12 Disabling billboard rendering, source of the evil black rectangles 2015-11-03 11:34:05 -08:00
Brad Davis
764ecba2a8 Adding diagnostics to track down the 'black rectangles of death' 2015-11-02 21:55:35 -08:00
Seth Alves
3ac0fef1ea merge from upstream 2015-11-01 15:22:57 -08:00
Brad Davis
ccbae81dad Merge branch 'master' into HEAD 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
 2015-10-29 10:24:38 -07:00
Howard Stearns
bc0e14cb71 Don't render avatar's renderBoundingCollisionShapes before the data is there. 
(Found while trying to repro "Deadlock in AvatarData::nextAttitude() on main thread" https://app.asana.com/0/32622044445063/61023569045356)
 2015-10-28 13:58:44 -07:00
Brad Hefta-Gaub
5a42991e0c first pass at cleaning up MyAvatars use of PalmData 2015-10-27 13:51:42 -07:00
Seth Alves
bc99ef778c change how render engine is told about model position changes 2015-10-20 12:04:29 -07:00
Seth Alves
a78f2a9577 have avatar make use of SpatiallyNestable 2015-10-18 09:48:46 -07:00
Seth Alves
275e77d29e remove old-style avatar referentials 2015-10-18 07:51:00 -07:00
Seth Alves
b18bb1e076 Merge pull request #6084 from AndrewMeadows/physics-cleanup 
move DIRTY_FLAGS out of EntityItem namespace
 2015-10-16 07:22:40 -07:00
Andrew Meadows
fa17b77d70 move DIRTY_FLAGS out of EntityItem namespace 2015-10-15 09:34:09 -07:00
Seth Alves
7c52849740 change how hold action works 2015-10-13 11:36:58 -07:00
Atlante45
fb284448b5 Raise display name not to collide with heads 2015-10-07 15:21:35 -07:00
Atlante45
efeeaa7ea7 Make display names 25% smaller 2015-10-07 15:14:06 -07:00
Atlante45
14a1860670 Do not change keyhole radius 2015-10-07 14:55:18 -07:00
Atlante45
fd6f0213ef CR 2015-10-07 14:55:18 -07:00
Atlante45
79b280f733 Update getDisplayNamePosition debug 2015-10-07 14:55:18 -07:00
Atlante45
91b46203f3 Don't take keyhole into account 2015-10-07 14:55:17 -07:00
Atlante45
946d289a99 Display name have a arc size instead of pixel size 2015-10-07 14:55:17 -07:00
Atlante45
35e2f8cd89 Removed _myAvatar from Application 2015-10-06 13:56:25 -07:00
Atlante45
cf3b33a96b Replace Application::getInstance() with qApp 2015-10-06 13:56:19 -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
samcake
910038cf82 Merging 2015-09-21 17:47:23 -07:00
Bradley Austin Davis
e024d23366 Instancing work, second pass 2015-09-21 13:27:02 -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
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
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
8d5106b072 improved debug render of hand coordinates 
also cleaned up includes in Hand.h
 2015-09-11 13:22:11 -07:00
Seth Alves
31fcd55d47 octree uses shared pointers 2015-09-08 11:59:48 -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
Howard Stearns
32eb51d0fa Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-03 13:55:57 -07:00
Andrew Meadows
b7d892cfcd Merge pull request #5691 from ctrlaltdavid/display-names-in-front 
Only render display names if in front of camera
 2015-09-01 19:59:06 -07:00
Howard Stearns
8cf71f285d Merge branch 'master' of https://github.com/highfidelity/hifi into decouple-avatar-updates 2015-09-01 16:03:40 -07:00
Seth Alves
76923583ee Interface only sends joint data to avatar-mixer if they have changed enough since the last send 2015-09-01 13:31:34 -07:00
David Rowe
2b17eafef4 Only render display names in front of camera 2015-09-01 10:24:50 -07:00
Howard Stearns
475331a97d Sprinkle locks everywhere. 2015-08-26 16:08:07 -07:00
Andrew Meadows
1d7d5071ae Merge pull request #5633 from howard-stearns/restore-body-indicators 
Restore body indicators (e.g., lookAt vectors).
 2015-08-23 15:46:57 -07:00
Howard Stearns
b579b996c3 There was a hidden (and inappropriate) dependency on face model loading. 2015-08-21 15:07:39 -07:00
David Rowe
6ee22055fa More temporary logging to track down cause of assert 2015-08-21 12:48:08 -07:00
Anthony J. Thibault
1b3d7fabc8 ResourceCache, NetworkGeometry and Model refactoring and optimizations. 
* Removed validation logic from Resource class, Qt does this internally and is more
  standards compliant.  This should result in more accurate caching and faster resource
  fetching when cache is stale and validation fails.
* Added loaded and failed slots to Resource class, so it does not have to be polled.

* NetworkGeometry now uses multiple Resource objects to download
  the fst/mapping file and the fbx/obj models.
* NetworkGeometry is no longer a subclass of Resource
* NetworkGeometry now has signals for success and failure, you no longer
  have to poll it to determine when loading is complete (except for textures *sigh*)

Some functionality was removed

* NetworkGeometry no longer has a fallback
* NetworkGeometry no longer loads LODs or has lod logic.
* The number of FBXGeometry copies is greatly reduced.

* Model::setURL no supports fallback URL, delayLoad or retainCurrent option.
  This can result in a pop when switching avatars, and there's no longer a default
  if avatar loading fails.
 2015-08-20 18:59:51 -07:00
Seth Alves
537b690d60 Merge pull request #5566 from howard-stearns/recapitate 
Get rid of separate head/body avatar
 2015-08-19 10:46:05 -07:00
Seth Alves
5fcbd37e43 possible fix for invisible other's-avatar bug 2015-08-18 15:45:17 -07:00
David Rowe
00aa336a2b Add further temporary debug for tracking down invalid scale value assert 2015-08-18 10:01:00 -07:00
Howard Stearns
0f6c0a3117 Merge branch 'master' of https://github.com/highfidelity/hifi into recapitate 2015-08-13 15:56:13 -07:00
Howard Stearns
2756a00638 Get default avatar url from resources. 2015-08-13 14:23:34 -07:00
Howard Stearns
62941c0914 Remove dead code. 2015-08-13 12:39:30 -07:00
David Rowe
e6473fc8b9 Merge branch 'master' into 20639 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Menu.h
	tests/ui/src/main.cpp
 2015-08-11 12:34:28 -07:00
Brad Davis
caf93d1aff Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Menu.h
 2015-08-08 13:18:13 -07:00
David Rowe
051a398fa2 Merge branch 'master' into 20639 2015-08-07 18:26:56 -07:00
David Rowe
3995c4476d Add temporary debug info for tracking down invalid scale value assert 2015-08-07 14:38:43 -07:00
Bradley Austin Davis
7e60aee1bf Merge branch 'master' into plugins 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/avatar/Head.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/avatar/MyAvatar.h
	interface/src/avatar/SkeletonModel.cpp
	interface/src/avatar/SkeletonModel.h
	interface/src/devices/3DConnexionClient.cpp
	interface/src/ui/overlays/Overlays.cpp
 2015-08-06 11:03:37 -07:00
David Rowe
d7b42e264e Merge branch 'master' into 20639 
Conflicts:
	interface/CMakeLists.txt
 2015-08-05 16:49:06 -07:00
David Rowe
e8eac7db34 Render look-at vectors and target in first person view 2015-08-05 13:40:57 -07:00
Philip Rosedale
df60453344 Merge pull request #5462 from ctrlaltdavid/20574 
CR for 20574 - Use single file robot model as fallback for full avatar models
 2015-08-05 08:55:00 -07:00
David Rowe
fae26d901c Add menu option to render look-at targets 2015-08-04 18:34:56 -07:00
David Rowe
f943dc8492 Use single file robot model as fallback for full avatar models 
Fixes having only a skeleton with no head if an invalid full model file
is configured.
 2015-07-29 19:34:05 -07:00
Andrew Meadows
81831975b5 remove legacy CapsuleShape from SkeletonModel 2015-07-27 12:27:17 -07:00
Andrew Meadows
73ac941230 remove unused legacy Shapes from Model and friends 2015-07-27 11:15:33 -07:00
Howard Stearns
1ec0518d05 Merge branch 'master' of https://github.com/highfidelity/hifi into rig 2015-07-27 09:20:30 -07:00
Bradley Austin Davis
0cbc12af8b Merge remote-tracking branch 'upstream/master' into plugins 2015-07-27 10:15:10 -04:00
Bradley Austin Davis
3c6416d6b8 Merge branch 'master' into plugins 2015-07-27 10:09:02 -04:00
Seth Alves
24fff719c5 quiet compiler 2015-07-25 21:11:23 -07:00
Seth Alves
4566d16402 move Model's AnimationHandles to Rig. Move a bunch of Model methods from public to protected 2015-07-23 13:03:38 -07:00
David Rowe
7c4f6b665b Use a default eye diameter for models without eyes, e.g., the masks 2015-07-23 11:04:58 -07:00
Bradley Austin Davis
1db4162371 Merge branch 'master' into plugins 2015-07-23 13:42:03 -04:00
Seth Alves
57eb798d63 Merge branch 'master' of github.com:highfidelity/hifi into rig 2015-07-23 09:46:41 -07:00
David Rowe
68254c1ff0 Merge branch 'master' into 20630 2015-07-23 09:46:20 -07:00
Seth Alves
ee334ff826 JointStates are owned by Rig objects. Model, FaceModel, SkeletonModel call into their Rig pointer to access JointStates. 2015-07-22 18:43:10 -07:00
David Rowe
3362358dcd Remove unused postLighting variable from Avatar and MyAvatar 
Fixes Leap and Hydra laser pointers not displaying.

Enables:
- Avatar billboard display
- Avatar collision bounding shape display
- Hand information display
 2015-07-22 17:50:55 -07:00
David Rowe
b515b163fb Remove dead code from Head 2015-07-22 17:50:54 -07:00
Seth Alves
7c8d52cbd1 back out some changes to Model.cpp, change how rig pointer is delivered to model initilizer 2015-07-22 13:41:31 -07:00
David Rowe
9d33cfa965 Allow for look-at positions being not quite up to date as avatars move 
So that looking-at-me indicators don't flicker on when they shouldn't.
 2015-07-22 09:53:37 -07:00
David Rowe
e44cba500d Guard against head model not being available yet 2015-07-22 09:52:49 -07:00
Bradley Austin Davis
114ab9e47f Merge branch 'master' into plugins 2015-07-22 11:47:56 -04:00
David Rowe
87dbbdb2e8 Set an initial alpha in anticipation of sphere alpha working 2015-07-21 18:25:35 -07:00
David Rowe
55683e0cd5 Size looking-at-me eye spheres per avatar model dimensions 2015-07-21 18:24:47 -07:00
David Rowe
bed266dfe9 Fade looking-at-me eye spheres over half a second 2015-07-21 18:23:50 -07:00
David Rowe
9ac4e2f687 Render spheres over avatar eyes if they're looking at me 2015-07-21 18:22:27 -07:00
Philip Rosedale
cf88bce082 Merge pull request #5367 from ctrlaltdavid/fix-speech-bubble-not-rendering 
Fix Avatar > Blue Sphere While Speaking not rendering
 2015-07-21 09:11:36 -07:00
David Rowe
716211c6b7 Merge branch 'master' into fix-speech-bubble-not-rendering 2015-07-21 08:45:13 -07:00
Brad Davis
5744200f64 Merge remote-tracking branch 'upstream/master' into plugins 
Conflicts:
	interface/CMakeLists.txt
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/avatar/MyAvatar.h
 2015-07-20 19:21:02 -07:00
Anthony J. Thibault
80dea6831c Merge branch 'plugins' of github.com:highfidelity/hifi into sam/vive-hand-controllers 
Conflicts:
	interface/src/Application.cpp
	libraries/input-plugins/src/input-plugins/SixenseManager.cpp
 2015-07-20 15:18:23 -07:00
Atlante45
8d6ff2d9f9 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 14:50:44 -07:00
Atlante45
59acfc9f47 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-20 13:51:51 -07:00
Stephen Birarda
0177513285 resolve conflicts on merge with upstream/master 2015-07-20 12:29:38 -07:00
David Rowe
73ffe5d9f6 Fix Avatar > Blue Sphere While Speaking not rendering 2015-07-20 10:25:59 -07:00
Brad Davis
81543d9185 Removing unneeded undef 2015-07-19 19:06:21 -07:00
Brad Davis
d68618e206 Removing GL headers from most files, and some naked GL from application.cpp 2015-07-18 00:46:09 -07:00
Atlante45
256c786e28 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-17 17:59:19 -07:00
Stephen Birarda
f8c832e50b resolve conflicts on merge with upstream master 2015-07-17 16:48:46 -07:00
Anthony J. Thibault
e8da4b9586 merge with plugins, needs testing 2015-07-16 18:47:39 -07:00
Brad Davis
89faf85ad9 Working on text rendering overlays 2015-07-16 15:56:01 -07:00
Stephen Birarda
61f23f6a5e Merge branch 'master' of https://github.com/highfidelity/hifi into atp 2015-07-16 11:56:26 -07:00
ZappoMan
d5a6e87a02 remove naked gl from Avatar::calculateDisplayNameTransform() 2015-07-15 16:34:23 -07:00
Stephen Birarda
05dde9d8f5 resolve conflicts on merge with upstream/master 2015-07-15 16:18:47 -07:00
ZappoMan
819fa852b8 first pass at GlowEctomy 2015-07-15 12:47:59 -07:00
Atlante45
fbb6a94579 Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol 2015-07-14 16:36:28 -07:00
Atlante45
bbb00b9d3a Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-07-14 14:11:41 -07:00
Atlante45
7bf45308b6 Merge branch 'master' of https://github.com/highfidelity/hifi into clear_cache_and_restart 2015-07-14 12:31:37 -07:00
Anthony J. Thibault
dbc18ce51f merge with plugins 2015-07-14 12:30:47 -07:00
Ryan Huffman
0edc909818 Merge branch 'protocol' of github.com:birarda/hifi into receive_packets 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	interface/src/Application.cpp
	libraries/networking/src/Packet.cpp
 2015-07-14 10:21:31 -07:00
Atlante45
c80df94b06 Update includes for moved files 2015-07-13 15:28:55 -07:00
David Rowe
59f456a2f2 Add an "is looking at me" indicator above avatars' heads 
Menu item: Developer > Avatar > Show Who's Looking at Me
 2015-07-13 14:16:39 -07:00
Stephen Birarda
859122db5d update signature of callbacks for avatar packets 2015-07-13 13:32:46 -07:00