Andrew Meadows
fa18d548f7
use proper category for NumAvatarsPerSec trace
2016-12-20 15:28:25 -08:00
Andrew Meadows
4d711d869c
cleanup
2016-12-20 14:45:11 -08:00
Andrew Meadows
991a61b722
fix data collection for AvatarsPerSec
2016-12-20 14:01:03 -08:00
Andrew Meadows
03114fa610
add AvatarsPerSec trace stats
2016-12-20 11:45:21 -08:00
Brad Hefta-Gaub
e3bc49c302
drop avatar data rate to 45hz
2016-12-13 16:51:59 -08:00
Zach Fox
7030c7b0a6
Space bubble improvements ( #9142 )
...
* The space bubble around a player's avatar is now visualized. When another avatar enters a player's bubble, The bubble visualization will appear, a soft tone will play, and the "Bubble" HUD button will flash.
* The space bubble radius setting has been removed. Space bubble size now scales based on avatar scale.
* Space bubble collision detection is now more accurate and reliable.
* CTRL + N toggles the bubble.
* The "Bubble" HUD button has been moved to the proper location.
2016-12-12 14:22:54 -08:00
Anthony Thibault
23aa626755
Destroy render scene & engine before Application is destroyed
...
Many render items/payloads contain smart pointers back to the
objects that added them to the scene, including entity and avatar
objects. Currently, those render items are destroyed when the
scene is destroyed very late in the application life-cycle.
There are rare crashes that can occur when these render items are
destroyed. Possibly, due to them referencing objects that have
already been destroyed via raw pointers. In an effort to
eliminate these crashes, we now destroy the scene earlier, within
Application::aboutToQuit() which is connected to the
QCoreApplication::aboutToQuit signal. Also, we guard against null
scene pointer dereferences. Any location that accesses the scene
off the main thread, now checks the validity of the scene pointer.
2016-10-25 15:28:37 -07:00
Ryan Huffman
23450e929b
Add special avatar id for attaching overlays
2016-09-13 16:33:58 -07:00
Andrew Meadows
25fb7aacad
ShapeManager hands out const shape pointers
2016-08-24 22:26:56 -07:00
Stephen Birarda
609900f246
move ignore set handling to NodeList
2016-07-13 15:06:31 -07:00
Stephen Birarda
6b6513d5f9
immediately fade out ignored avatars
2016-07-13 15:06:31 -07:00
Seth Alves
11542aeca2
pick against avatar's capsule and then against the T-pose mesh
2016-07-07 16:36:25 -07:00
Seth Alves
5f9c7b6ea5
trying to take joint information into account when raypicking against models
2016-06-29 17:02:49 -07:00
Seth Alves
c3dbe5d9c4
ray pick against avatar meshes rather than capsules
2016-06-29 09:45:09 -07:00
Seth Alves
0f9f4749e7
fix invokeMethod in AvatarManager::findRayIntersection
2016-06-28 11:18:46 -07:00
Seth Alves
8a0d58a0c2
fix invokeMethod in AvatarManager::findRayIntersection
2016-06-28 11:15:01 -07:00
Seth Alves
4e70e8ed42
js call to ray-pick against avatars
2016-06-28 09:55:49 -07:00
Atlante45
e2fa734024
Set collision threashold to walking speed
2016-06-02 19:15:55 -07:00
Atlante45
4e8b61dea0
Limit collision injectors count to 3
2016-06-02 19:12:37 -07:00
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
ZappoMan
819fa852b8
first pass at GlowEctomy
2015-07-15 12:47:59 -07:00
Niraj Venkat
1f1a5f8e75
Coding standard and fixing pointers
2015-07-13 22:57:11 -07:00
Niraj Venkat
10e0a93ac0
Fix for avatar rendering not working on domain exit/entry
2015-07-13 15:22:00 -07:00
Niraj Venkat
dacc6f66c0
Avatars rendered correctly based on Scene.shouldRenderAvatars
2015-07-10 17:26:56 -07:00
Howard Stearns
1c2972bd7c
Expose avatar collisions to scripts, and include velocityChange in exposed collision data.
2015-07-07 11:49:55 -07:00
Howard Stearns
1f3a1f6ac8
Add comments re upcoming physics changes.
2015-07-02 10:07:14 -05:00
Howard Stearns
dc7360cdc2
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-collision-sounds
2015-06-27 08:37:30 -07:00
Howard Stearns
98f165f2ae
Avatar collision sounds.
...
collisionsSoundURL can be set in preferences:
Currently defaults to https://s3.amazonaws.com/hifi-public/sounds/Collisions-hitsandslaps/airhockey_hit1.wav .
Can be empty, which means no sound, rather than restoring default.
MyAvatar.collisionSoundURL can read/written in scripts.
Preloads when set, so that it won't have to fetch on first collision.
Plays at start of collision only, with volume proportional to "velocity change"^2.
2015-06-26 16:23:16 -07:00
Stephen Birarda
c6df573933
fix some OS X warnings, add description to tooltip
2015-06-26 10:50:31 -07:00
Andrew Meadows
ce9dfc098b
unhook motionstate before removing avatar
2015-06-22 15:40:26 -07:00
Seth Alves
508ae276c6
enable -Wdouble-promotion
2015-06-16 18:23:10 -07:00
Atlante45
8570fe0c19
Shared ptr tweaks
2015-06-10 15:02:26 +02:00
Atlante45
3af8bec3d7
Fix ghost avatars/displaynames
2015-06-10 14:59:27 +02:00
ZappoMan
adcb62eb18
more hacking and cleanup
2015-06-02 21:03:34 -07:00
ZappoMan
4ce27f1483
first cut at rendering avatars as individual model items
2015-06-02 16:54:47 -07:00
ZappoMan
2fba5a0928
more work on simple renderable
2015-05-28 12:19:43 -07:00
Ryan Huffman
f972e84d6c
Move avatar renedering to Scene
2015-05-27 12:40:26 -07:00
Ryan Huffman
389d5556f5
Update Avatar*Pointers to use std::*_ptr instead of Q*Pointer
2015-05-27 12:36:55 -07:00
ZappoMan
20ceb72d92
Merge branch 'master' of https://github.com/highfidelity/hifi into team-teaching
2015-05-26 15:01:26 -07:00
Ryan Huffman
3f22b5f8b3
Add RenderArgs to more render methods
2015-05-22 15:25:53 -07:00
Andrew Meadows
01cc629224
fix crashes during init and shutdown
2015-05-22 09:20:08 -07:00
Andrew Meadows
67f5d0773d
some list management of AvatarMotionStates
2015-05-21 14:40:47 -07:00
Andrew Meadows
2f4162f447
cleanup of AvatarManger API
2015-05-19 16:53:30 -07:00
Andrew Meadows
f86c419988
stubbery for collidable avatars
2015-05-19 14:15:26 -07:00
Atlante45
809c7919aa
Fix ghost avatars
2015-04-13 15:57:36 +02:00
Sam Gateau
00817ab64f
MErging with origin/orange, brinign the fix for shadows
2015-04-05 18:36:39 -07:00
Stephen Birarda
b27a86fb25
always render yourself, handle change of render values elsewhere
2015-04-01 17:36:43 -07:00
Sam Gateau
9b63739a72
Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations
2015-03-31 17:35:34 -07:00
Stephen Birarda
5e864278a3
fix packet processing, PerfWarn label
2015-02-06 12:21:05 -08:00
Atlante45
2d973e5288
Move updateMyAvatar to AvatarManager
2015-01-29 16:55:32 -08:00
Atlante45
6b7a391885
move a couple avatar initialisations outside avatar maanger
2015-01-29 16:00:57 -08:00
ZappoMan
41c135c4e5
move GlowEffect to libraries
2014-12-15 19:19:21 -08:00
ZappoMan
e53833b306
make GlowEffect support DependencyManager
2014-12-15 17:29:48 -08:00
Andrzej Kapolka
ace415b138
Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels
...
Conflicts:
interface/src/MetavoxelSystem.cpp
2014-12-04 16:46:32 -08:00
ZappoMan
526664ac57
delete old dead code
2014-12-01 22:11:34 -08:00
Andrzej Kapolka
8d3eef708a
Move various avatar render bits to post-lighting section.
2014-09-19 13:13:05 -07:00
Andrzej Kapolka
c6aad42f21
Move LocalLight to AvatarManager, apply it at the avatar level.
2014-09-18 17:09:53 -07:00
Andrew Meadows
1a8a2d9156
Add Avatar submenu to main menu for non-debug stuff
2014-08-19 17:26:01 -07:00
Atlante45
de8c7fb204
Fix avatar not fading out
2014-08-06 12:14:36 -07:00
Andrzej Kapolka
be028c2b01
Fixes for local lights.
2014-07-22 14:13:51 -07:00
TonyPeng
7aae85833b
Take out getter for avatar's hash key.
2014-07-16 10:08:49 -07:00
TonyPeng
90d56bc108
Use the number of local lights to update new avatars instead of checking hashes.
2014-07-15 16:10:13 -07:00
TonyPeng
28854363d4
Coding standard
2014-07-15 09:20:33 -07:00
TonyPeng
1aa20dff60
Expose light directions and colors for the avatar list in AvatarManager. Light parameter changes within the script will effect all the avatars currently in AvatarManager.
2014-07-14 13:59:57 -07:00
Andrew Meadows
fdd9acb477
bug fix: bad logic for early exit
2014-07-10 10:55:41 -07:00
Andrew Meadows
d26585728b
Improved stat accumulation and context names
2014-07-09 11:53:53 -07:00
Stephen Birarda
77202af20d
add debug for erase from AvatarHashMap, repair check for display name
2014-04-17 18:05:22 -07:00
Stephen Birarda
f8106e5063
add an AvatarHashMap to the Agent
2014-04-17 17:49:55 -07:00
Stephen Birarda
e75d14139f
fix avatar kill behaviour
2014-04-17 17:21:38 -07:00
Stephen Birarda
69d3360675
add a convenience method to AvatarHashMap to check for avatar removal
2014-04-17 16:48:24 -07:00
Stephen Birarda
e303ce1a12
move some Avatar management to AvatarHashMap
2014-04-17 16:37:40 -07:00
Stephen Birarda
c208af2246
Merge branch 'master' of https://github.com/highfidelity/hifi
2014-04-09 15:10:48 -07:00
Stephen Birarda
684c6b5372
run regex header replacement on all cpp files
2014-04-09 09:35:42 -07:00
Stephen Birarda
974d8c0427
prepare header files for regex run against cpp
2014-04-09 09:35:05 -07:00
Andrew Meadows
2f97dd2574
sessionID --> sessionUUID for consistency
2014-04-09 08:22:35 -07:00
Andrew Meadows
79670563d4
AvatarData stores its sessionID
2014-04-07 14:42:49 -07:00
Stephen Birarda
8a796be785
only fade avatars if they have ever been initialized
2014-03-25 11:10:28 -07:00
Stephen Birarda
f763859fd0
don't attempt to render avatars until they are initialized
2014-03-25 10:44:52 -07:00
Andrzej Kapolka
62884f1f4f
Don't use textures/fancy shaders when rendering shadow map. Closes #2270 .
2014-03-24 13:15:03 -07:00
Andrew Meadows
75ab970c0d
fix bug: bad offset into avatar data during decode
2014-03-17 18:23:09 -07:00
Andrew Meadows
ed3cf36045
cleanup: AvatarData doesn't derive from NodeData
...
Cleaner Interface since the AvatarData is already not the NodeList.
Reduces overhead/confusing code when parsing packets from AvatarMixer.
2014-03-17 14:10:42 -07:00
Andrew Meadows
68ba2201df
cleanup of Avatar:: and MyAvatar::render()
...
MyAvatar now calls Avatar::render() which does most of the work.
Also, made ::renderBody() a proper virtual function
2014-03-17 10:22:02 -07:00
Andrzej Kapolka
35d0fa7189
Don't render avatars until they've been simulated, init before first simulate.
...
Closes #2262 .
2014-03-11 13:46:58 -07:00
Andrzej Kapolka
3930b3e824
Display names are great, but not in the shadow map. Closes #2208 .
2014-03-05 17:44:08 -08:00
Andrzej Kapolka
038f1acf01
Don't render the hover text in mirror/billboard mode. Closes #2098 .
2014-02-25 15:34:16 -08:00
Andrzej Kapolka
d80b52dc9f
Fixes for camera mode transitions, seeing inside head.
2014-02-24 11:33:52 -08:00
Andrzej Kapolka
ac02609bc2
The basic billboard behavior, closes #1864 .
2014-02-21 15:38:49 -08:00
Stephen Birarda
ee9f8937e3
fix a silly typo
2014-02-19 18:03:34 -08:00
Jose Carlos
44d5b9b2f8
cosmetic change
2014-02-20 00:22:29 +01:00
Jose Carlos
ee7b5844b8
Minor cosmetic change
2014-02-19 23:24:26 +01:00
Jose Carlos
19cb20f0cd
Added rect around the display name with proper size, paying attention to
...
QFontMetrics data
Fully wired up the message sending and receiving from server
2014-02-15 01:05:21 +01:00
Jose Carlos
04c59b825e
merged from master
2014-02-14 20:52:22 +01:00
Jose Carlos
319d1f6795
Wired up the send of the display data to the servers
...
Added the renderDisplayName in Avatar
2014-02-12 00:54:50 +01:00
Jose Carlos
665971c2ab
Merge remote-tracking branch 'upstream/master' into 19489
2014-02-10 23:56:10 +01:00
Jose Carlos
b42c2a9dbe
Centered text
2014-02-10 23:55:43 +01:00
Andrew Meadows
be1aaee359
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
2014-02-10 09:05:08 -08:00
Jose Carlos
4aa053befe
Constant size in 3D world billboard text
2014-02-09 23:59:51 +01:00
Jose Carlos
d05fb392e0
Always facing camera billboard
...
TODO: having constant fix size
2014-02-09 23:39:53 +01:00
Andrew Meadows
082b7cf1a9
Merge branch 'master' of ssh://github.com/highfidelity/hifi into avatar-interaction
...
Conflicts:
interface/src/avatar/Avatar.cpp
interface/src/avatar/Avatar.h
interface/src/avatar/MyAvatar.cpp
2014-02-06 14:37:19 -08:00
Andrew Meadows
802967512a
Splitting rendering of avatars and their collision proxies.
...
Also disabling old hand-avatar interactions and trying to use new stuff.
2014-02-06 14:14:48 -08:00
Stephen Birarda
f92f9ec0c2
Merge branch 'master' of https://github.com/highfidelity/hifi into authentication
2014-02-06 09:28:03 -08:00
