Atlante45
854bf82631
Raise and stretch collision sounds threshold
2016-06-02 17:37:36 -07:00
Stephen Birarda
2cf943b2b1
remove billboard code from AvatarData
2016-05-12 16:41:44 -07:00
Anthony J. Thibault
80a349c65b
Merge branch 'master' into tony/improved-avatar-debug-draw
2016-05-10 14:50:13 -07:00
Anthony J. Thibault
641e152699
Eye tracking bug fix and debug rendering improvement
...
* Bug fix for eye tracking in HMD, the "up" orientation of your eyes now match your head.
* DebugDraw: added drawRay method.
* Application: Renamed preRender to postUpdate
* AvatarManager: added postUpdate method that iterates over all avatars.
* MyAvatar: Renamed preRender to preDisplaySide
* MyAvatar: split preRender code into postUpdate and preDisplaySide.
* Removed "Show who is looking at me", "Render focus indicator" and "Render lookat target" debug draw.
* Split "Show Look At Vectors" into "Show My Look At Vectors" and "Show Other Look At Vectors", to make it easier to debug eye tracking.
* "Show Look at Vectors" now draws the right eye red and the left eye blue.
* Removed Avatar and MyAvatar renderBody
* Removed look at rendering from head.
* GLMHelpers: Bugfix for generateBasisVectors when up primary and secondary axis were orthogonal
2016-05-08 16:20:32 -07:00
Atlante45
bc6544a3c5
Fix MyAvatar's velocity change
2016-05-05 14:55:28 -07:00
Atlante45
96ee33e80e
Fix avatars collision sounds
2016-05-05 14:55:28 -07:00
Zach Pomerantz
4dacb04ee1
Rm myAvatar motion states on shutdown
2016-04-19 16:01:55 -07:00
Zach Pomerantz
146ea066db
Update AvatarManager.cpp
2016-04-18 14:53:04 -07:00
Zach Pomerantz
c9dc642d76
Fix type in AvatarManager::clearAllAvatars
2016-04-18 14:48:24 -07:00
Zach Pomerantz
790e325248
Clear entities and avatars on exit
2016-04-18 14:31:16 -07:00
Anthony J. Thibault
ce47f83288
Prevent deadlock if idle is called during rendering
...
This extraordinary event can occur if a MessageBox is popped up by the opengl driver.
* removed AvatarData::avatarLock
* removed AvatarUpdate
This code was left over from an earlier avatar threading experiment.
Removed AvatarData avatarLock and AvatarUpdate class
2016-03-21 15:11:15 -07:00
Anthony Thibault
1e94d9bdf5
interface/src/avatar: cppcheck fixes
2016-03-13 18:56:15 -07:00
Seth Alves
01d3977bf1
make avatars shrink faster
2016-02-19 10:04:58 -08:00
samcake
640bf81339
Forcing an update from teh avatar manager to the avatar renderItems when beeing updated
2016-02-16 17:19:31 -08:00
Stephen Birarda
058bba7b55
move avatar invokables from AvatarManager to AvatarHashMap
2016-02-03 17:13:35 -08:00
Andrew Meadows
36e19b43c9
add some comments; specify const and overrides
2016-01-07 10:19:46 -08:00
Andrew Meadows
6a642bdcf8
fix misusage of smart-pointers
2016-01-07 10:19:46 -08:00
Andrew Meadows
6eb177091b
overhaul of MotionState cleanup
...
Moved MotionState deletes out of PhysicsEngine.
EntityMotionStates are deleted by the PhysicsEntitySimulation.
AvatarMotionStates are deleted in the Avatar dtor.
2016-01-07 10:19:46 -08:00
Andrew Meadows
9ab5ef358a
remove dangling whitespace
2016-01-05 16:44:36 -08:00
Howard Stearns
9c8a04ce1e
Merge branch 'master' of https://github.com/highfidelity/hifi into pid-render-limits
2016-01-04 09:26:14 -08:00
Ryan Huffman
00b47cacea
Fix crash when getting MyAvatar.sessionUUID from AvatarManager
...
The previous code inadvertently added a default constructed shared pointer
to the avatar hash, causing it to crash when dereferencing it in
the update loop.
2015-12-22 09:59:57 -08:00
Howard Stearns
da27cacdec
Merge branch 'master' of https://github.com/highfidelity/hifi into pid-render-limits
2015-12-16 20:56:33 -08:00
Howard Stearns
5ac5ecfc22
drop obsolete include
2015-12-16 20:35:56 -08:00
howard-stearns
23ffcdca3e
big sweep
2015-12-16 17:01:14 -08:00
howard-stearns
09d4a06ad4
LODManager-centric stats and preferences.
2015-12-16 15:30:48 -08:00
Andrew Meadows
9b0c199ed7
updateAvatarPhysicsShape-->addAvatarToSimulation
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
howard-stearns
1d65cbce88
Remove unneeded getTargetFramePeriod and isVSynchronized.
2015-12-08 18:08:57 -08:00
howard-stearns
9ae22800fe
Merge branch 'fix-sync-period-calc' into correct-target-frame-rate
2015-12-08 17:32:53 -08:00
howard-stearns
32e4967ee0
cleanup
2015-12-08 16:38:05 -08:00
howard-stearns
5b41d4da1c
Snapshot of "working" version.
2015-12-08 15:30:23 -08:00
Howard Stearns
faec4639b1
cap
2015-12-08 09:14:40 -08:00
howard-stearns
9512c3f73d
Debugging.
...
Please enter the commit message for your changes. Lines starting
2015-12-07 16:58:59 -08:00
howard-stearns
55cfd1c8b4
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-sync-period-calc
2015-12-07 15:49:47 -08:00
howard-stearns
2974241796
typo
2015-12-07 15:49:29 -08:00
Howard Stearns
17ecf9b6b7
debugging
2015-12-07 11:26:56 -08:00
Howard Stearns
fa0ad1fe4d
Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate
2015-12-04 16:12:22 -08:00
Atlante45
1d498af76e
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-12-04 15:18:25 -08:00
Brad Hefta-Gaub
d9a1563396
Merge pull request #6152 from sethalves/parents
...
Parents
2015-12-04 10:26:57 -08:00
Howard Stearns
d51785a259
Merge branch 'master' of https://github.com/highfidelity/hifi into correct-target-frame-rate
2015-12-03 17:28:32 -08:00
Howard Stearns
4a8649c202
Change get/setRenderDistanceLow/HighLimit and avatarRenderDistanceHighLimit to get/setRenderDistanceInverseLow/HighLimit and avatarRenderDistanceInverseHighLimit.
2015-12-03 14:23:16 -08:00
Howard Stearns
375211e13b
Use isVSynchronized in controller.
2015-12-03 11:29:13 -08:00
Howard Stearns
861393910a
Add an avatar LOD preference called "Minimum Avatar Display Distance"
2015-12-02 12:12:57 -08:00
Atlante45
8d9eeb3897
Have separate left/right hold action offset
2015-11-30 18:04:34 -08:00
Seth Alves
b7ebe5b92b
merge from upstream
2015-11-30 16:59:52 -08:00
Anthony J. Thibault
f922f61c3d
AvatarUpdate: fix for very large dt
...
This was affecting threaded avatar update when enabled.
2015-11-30 15:21:04 -08:00
Seth Alves
ca75802b9c
unmangle merge
2015-11-26 06:43:28 -08:00
Anthony J. Thibault
23def8d173
Merge branch 'master' into tony/remove-joint-states
2015-11-25 13:55:23 -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
Stephen Birarda
905e11faa3
use MIN_AVATAR_SCALE to ensure avatar fades complete
2015-11-23 16:54:17 -06:00
Howard Stearns
5912808077
getShouldSkipRendering() => !getShouldRender().
2015-11-23 10:27:49 -08:00
Howard Stearns
f1e0742aeb
Add getTargetFrameRate().
2015-11-23 10:20:59 -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
1ddcc62db9
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-render-controller2
2015-11-20 14:05:40 -08:00
howard-stearns
6c784256cb
final(?) cleanup
2015-11-20 13:51:12 -08:00
howard-stearns
a366598598
snapshot. It works.
2015-11-20 11:48:44 -08:00
Stephen Birarda
9b5bfd45bc
change lock back to locker to remove change
2015-11-20 11:04:46 -08:00
Stephen Birarda
19d3d80ff9
fixes for some incorrect assumptions
2015-11-20 11:03:52 -08:00
Howard Stearns
b5e5adc41e
Update for changed target frame period.
2015-11-20 09:51:57 -08:00
Howard Stearns
0f6a37f0f7
remainder->fmod!
2015-11-20 09:49:14 -08:00
Howard Stearns
431a8c9584
cleanup
2015-11-19 17:12:50 -08:00
Stephen Birarda
430cb7876d
remove a couple of read lockers for AvatarHashMap
2015-11-19 16:22:56 -08:00
Stephen Birarda
40397add43
fix for extra adds in AvatarManager
2015-11-19 16:15:21 -08:00
Stephen Birarda
6398a922c6
leverage COW for AvatarHash
2015-11-19 15:43:29 -08:00
Stephen Birarda
5140a480a1
fix for recursive write then read lock
2015-11-19 15:35:41 -08:00
Stephen Birarda
2a05ec650b
fix locking in AvatarHashMap/AvatarManager
2015-11-19 14:17:48 -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
42a1ee353e
checkpoint
2015-11-18 14:09:33 -08:00
Howard Stearns
fee13d4375
Rebuild on a new branch after original stopped building.
2015-11-17 20:06:25 -08:00
Seth Alves
ffb0317a50
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-11-03 16:53:00 -08:00
Seth Alves
60824a1fb0
back out some off-brand changes. add parentChanged call
2015-11-03 16:07:28 -08:00
Howard Stearns
fc63fa6f7b
Update comments, and don't continue through collisions after finding one for our avatar.
2015-11-01 18:55:43 -08:00
Seth Alves
3ac0fef1ea
merge from upstream
2015-11-01 15:22:57 -08:00
Anthony J. Thibault
085282db4f
Crash fix for AvatarManager when iterating over _avatarHash
...
The main problem is that a null shared pointer was inserted into the _avatarHash
via the AvatarManager::getAvatarBySessionID(). When the sessionID is not present
in the _avatarHash, [QHash](http://doc.qt.io/qt-5/qhash.html#operator-5b-5d ) will *insert*
an empty smart_ptr into the hash.
2015-10-30 16:13:04 -07:00
Howard Stearns
3c6d4f9c22
Thread safety per #6154 .
2015-10-29 11:02:24 -07:00
Howard Stearns
367175b8a6
Reduce lock time.
2015-10-28 10:49:19 -07:00
Howard Stearns
7b0b77f4d1
getAvatarHash => withAvatarHash
2015-10-23 16:57:27 -07:00
Seth Alves
f6fe503c51
pass avatar parent information through avatar-mixer
2015-10-22 13:44:04 -07:00
Howard Stearns
0d514ad645
Thread-safe avatar list access
2015-10-22 13:02:08 -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
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
cf3b33a96b
Replace Application::getInstance() with qApp
2015-10-06 13:56:19 -07:00
Brad Davis
aa989c3687
Fixing some entity race condition crashes
2015-09-10 20:53:17 -07:00
Howard Stearns
0065c64b31
Snapshot of no-judder, before cleanup.
2015-09-07 09:57:05 -07:00
Howard Stearns
2429134b37
Lock both myavatar activities, not one.
2015-08-27 13:44:19 -07:00
Howard Stearns
475331a97d
Sprinkle locks everywhere.
2015-08-26 16:08:07 -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
Seth Alves
8ac06c4059
remove friend class from Avatar
2015-07-27 08:48:16 -07:00
Anthony J. Thibault
87a0e48d30
Updates to overlay fade
...
* vive rendering works again
* overlay fades away in standing mode, if you look or move away from the overlay sphere.
* middle mouse button can be used to fade in or out the overlay
* mouse pointer renders properly on overlay
2015-07-23 20:36:58 -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
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
Stephen Birarda
ce6585ccc8
fix AC monitor and AM double register
2015-07-16 17:44:43 -07:00
