Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-19 19:22:15 +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
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
Atlante45
80fe090a94 Merge branch 'master' of https://github.com/highfidelity/hifi into smart_pointers 2015-07-10 20:20:03 -07:00
Atlante45
a3848f08d2 Conditionnal fixes. 2015-07-10 15:36:17 -07:00
Sam Gateau
7fc9fd97ff Replacing setUniformTexture by setResourceTexture in order to differenciate the 2 types of binding points for the BUffers. 2015-07-10 11:03:12 -07:00
Anthony J. Thibault
c69665e0fe fix for goToLocation 2015-07-10 09:43:33 -07:00
Atlante45
2ba6bd3afc Double display name offset 2015-07-06 18:39:43 -07:00
Atlante45
687f9dda4a Restore old offset behaviors 2015-07-06 18:21:17 -07:00
Atlante45
9bf6c439aa Use depth bias to avoid z-fighting on display name 2015-07-04 18:34:19 -07:00
Atlante45
32cf4dac78 Fix displayname z-fighting 2015-07-04 16:06:38 -07:00
Brad Hefta-Gaub
2a03f62bf2 Merge pull request #5232 from sethalves/actions-over-wire-and-sim-ownership 
Actions over wire and improved simulation ownership
 2015-07-02 14:57:27 -07:00
Philip Rosedale
fba569d7db Merge pull request #5218 from huffman/fix-hmd-displayname-orientation 
Fix avatar displayname to point towards camera
 2015-07-02 12:19:40 -07:00
David Rowe
0df9ebeda3 Fix rendering of look-at avatar sphere 
postLighting is never true.
 2015-07-01 22:45:13 -07:00
Atlante45
ee13407066 Fix smart pointer casts 2015-07-01 19:22:40 -07:00
ericrius1
a24df5c02f added postLighting check back for rendering avatar Hands 2015-07-01 15:28:48 -07:00
ericrius1
8129d0eb1f hydra lasers are now rendering again 2015-07-01 15:12:37 -07:00
ericrius1
8b00864175 hydra hand spheres and lasers are rendering again 2015-07-01 15:04:19 -07:00
Ryan Huffman
760a5bfa37 Fix call to atan2 when params are 0 2015-06-26 17:23:06 -07:00
Ryan Huffman
abe8cfe90f Fix avatar displayname to point towards camera 
Previously it used the camera orientation, which means all display names
have the same orientation, and will all rotate when you turn your head.
Instead, you only want to change the orientation of a particular display
name when you move.
 2015-06-26 16:17:11 -07:00
Seth Alves
7c26641560 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-25 17:40:27 -07:00
Anthony J. Thibault
99a03bac21 Render a different model when in first person view. 
Currently this model is identical to the third person model, except
that the head bones have been 'cauterized' by applying a zero scale transform.
This allows us to set the near clip back to a reasonable value.
 2015-06-24 16:10:47 -07:00
Seth Alves
20f173a474 Merge branch 'master' of github.com:highfidelity/hifi into actions-over-wire 2015-06-22 19:36:09 -07:00
Andrew Meadows
b7c728a794 assert AvatarMotionState unhooked before delete 2015-06-22 15:40:02 -07:00
Seth Alves
32cf669d8b moving toward sending actions over wire 2015-06-18 17:51:41 -07:00
Seth Alves
021dc64789 merge from upstream 2015-06-18 15:03:09 -07:00
Atlante45
d0f27f1648 Change display names size 2015-06-18 15:23:53 +02:00
Atlante45
c38fa46eb1 Increase anti z-fighting value 2015-06-18 15:23:53 +02:00
Atlante45
045a6a6ad9 Use render args frustum 2015-06-18 15:23:52 +02:00
Atlante45
be261cd038 Increase anti z-fighting value 2015-06-18 15:23:52 +02:00
Atlante45
fb6de91cbe HACK Prevent head hight value explosion 2015-06-18 15:23:51 +02:00
Atlante45
3b41a8f209 Cancel display names roll 
This is annoying in HMD
 2015-06-18 15:23:51 +02:00
Atlante45
e1b5a3c204 Fix display name transform 
They now have a fixed pixel size and ar pixel aligned
 2015-06-18 15:23:51 +02:00
Atlante45
d7b9a1b032 Cleanup TextRenderer3D methods args 2015-06-18 15:23:49 +02:00
Atlante45
47634a48a6 Make renderDisplayName const 2015-06-18 15:22:49 +02:00
Seth Alves
508ae276c6 enable -Wdouble-promotion 2015-06-16 18:23:10 -07:00
Atlante45
228f8c2e61 Fix a few items rendering without pipeline 2015-06-12 17:34:16 +02:00
ZappoMan
139855f487 handle remove attachment case 2015-06-10 16:13:17 -07:00
ZappoMan
e06422825a mostly getting attachments working again 2015-06-10 15:46:54 -07:00
ZappoMan
aa05d9f67c Merge branch 'master' of https://github.com/highfidelity/hifi into fix-attachments 2015-06-10 08:53:33 -07:00
Atlante45
3af8bec3d7 Fix ghost avatars/displaynames 2015-06-10 14:59:27 +02:00
ZappoMan
e0adb8e38a render avatar attachments as model payload items 2015-06-09 12:57:04 -07:00
Atlante45
141d8fa055 Use setUniformTexture 2015-06-08 18:55:13 +02:00
Atlante45
31e565868d Bind simple textured program 2015-06-08 17:15:50 +02:00
Atlante45
8eeb5e435c Enable/Disable texture for avatar billboards 2015-06-08 17:13:37 +02:00
Atlante45
d3eaa4755c Partial fix to billboards 2015-06-08 16:43:38 +02:00
Atlante45
34bdcebbf6 More display name work 2015-06-08 16:28:15 +02:00
Atlante45
2bee021a66 Fix Avatar display names 2015-06-08 15:26:17 +02:00
Atlante45
8e21d9c14b Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod 2015-06-04 18:11:17 +02:00
ZappoMan
7fde574a2a make model overlays acutally use sub mesh payload items 2015-06-03 16:33:58 -07:00
Atlante45
82133f4e7b Merge branch 'team-teaching' of https://github.com/highfidelity/hifi into lod 2015-06-03 19:47:18 +02:00
Atlante45
9df1b05184 Introduce outsideEngineDetails 2015-06-03 18:08:43 +02:00
Brad Hefta-Gaub
8b120ea8cd Merge pull request #5029 from huffman/avatar-batches 
Team Teaching - Avatar batches
 2015-06-03 09:06:10 -07:00
Atlante45
bbf1837796 Introduced RenderDetails/Stats don't pull details 
- Regrouped everything stat in a struct
	- Details are set into the stats
 2015-06-03 16:14:23 +02:00
ZappoMan
ff54334fe1 more work on making avatar models (face included) use render payloads 2015-06-02 22:10:53 -07:00
ZappoMan
a7feca0727 more work on making avatar models (face included) use render payloads 2015-06-02 22:10:00 -07:00
Ryan Huffman
847eccca84 Remove gl polygon offset calls 2015-06-02 22:02:50 -07:00
ZappoMan
adcb62eb18 more hacking and cleanup 2015-06-02 21:03:34 -07:00
Ryan Huffman
c4dbf6dae8 Update Avatar rendering to use batches 2015-06-02 17:06:41 -07:00
ZappoMan
4ce27f1483 first cut at rendering avatars as individual model items 2015-06-02 16:54:47 -07:00
Ryan Huffman
c5a3edee09 Fix error with duplicate variable names 2015-05-27 13:13:52 -07:00
Ryan Huffman
00db7fca70 Update avatar rendering to set displayLookAtVectors 2015-05-27 13:11:29 -07:00
Ryan Huffman
f972e84d6c Move avatar renedering to Scene 2015-05-27 12:40:26 -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
1d12744781 Remove commented out code 2015-05-22 15:34:19 -07:00
Ryan Huffman
3f22b5f8b3 Add RenderArgs to more render methods 2015-05-22 15:25:53 -07:00
Andrew Meadows
67f5d0773d some list management of AvatarMotionStates 2015-05-21 14:40:47 -07:00
Stephen Birarda
57fa3d8c53 fixes for other avatar receive stats rendering 2015-05-13 14:43:31 -07:00
Bradley Austin Davis
fc73676b4d Merge branch 'master' into plugins_pt1 2015-05-06 11:43:25 -07:00
Stephen Birarda
aeb04cf9c3 use existing numerical constant in Avatar 2015-05-04 10:28:28 -07:00
Bradley Austin Davis
fb3e309a64 Merge branch 'master' into plugins_pt1 2015-05-04 10:00:13 -07:00
Seth Alves
0341caad95 quiet compiler 2015-05-03 11:10:52 -07:00
Brad Davis
302aa9db47 Removing access to the gl widget and display managers 2015-05-02 00:49:52 -07:00
Stephen Birarda
b9c9ff6a14 clean up various warnings 2015-05-01 16:49:13 -07:00
Stephen Birarda
17142a532f add stats for max FRD and num avatars last frame 2015-04-30 10:09:23 -07:00
Stephen Birarda
f9a25d7089 add Menu option to toggle Avatar receive stats 2015-04-28 18:27:54 -07:00
Stephen Birarda
f2dcacffd0 show avatar data receive rate by default with display name 2015-04-28 18:27:42 -07:00
Stephen Birarda
4e6979cac8 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-mixer-throttling 2015-04-28 16:50:07 -07:00
Stephen Birarda
62688e5c53 add Menu option to toggle Avatar receive stats 2015-04-28 10:13:18 -07:00
Stephen Birarda
b917afa3cc show avatar data receive rate by default with display name 2015-04-28 09:47:19 -07:00
Andrew Meadows
7cd9023e23 build Avatar shape on SkeletonModel load 2015-04-24 13:26:26 -07:00
Andrew Meadows
a47170b02c Merge pull request #4601 from samcake/temp1 
Introducing gpu::State and using it in the Model rendering path and more...
 2015-04-07 12:48:42 -07:00
Seth Alves
9014397167 try again without macro 2015-04-07 09:59:04 -07:00
Seth Alves
fc5b442e12 interface is reserved, so use interfaceapp as the logging tag for interface. also experiment with a macro for logging 2015-04-07 09:15:11 -07:00
Seth Alves
fb607e2b26 logging groups for library/shared and interface 2015-04-06 18:45:06 -07:00
Sam Gateau
ecdffadcb7 trying to debug the indirect sh lighting going wrong, the noraml on avatar is not correct 2015-04-06 10:17:31 -07:00
Sam Gateau
00817ab64f MErging with origin/orange, brinign the fix for shadows 2015-04-05 18:36:39 -07:00
Sam Gateau
423434af10 FInd one of the issue with shadows for avatars 2015-04-03 12:34:30 -07:00
Stephen Birarda
ee088e12f3 leverage scene scripting values to toggle rendering 2015-04-01 17:06:06 -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
Brad Hefta-Gaub
53ae4b48bc Merge pull request #4459 from ctrlaltdavid/20400 
CR for 20400 - Name tags going through the head
 2015-03-17 21:54:13 -07:00
Brad Davis
895a0d7b85 Correcting frustum usage by the avatar renderer that was causing aspect ratio problem 2015-03-17 16:14:35 -07:00
David Rowe
d08a25f1a3 A more realistic default head height 2015-03-16 15:48:10 -07:00
David Rowe
913527eaa3 Calculate head height based on skeleton model mesh if no head model 
This fixes the problem of some skeleton models with heads having
display names rendering through them.
 2015-03-16 15:47:54 -07:00
David Rowe
08c95555dd Calculate head height based on model mesh rather than joints 
This fixes the problem of some head models having display names
rendering through them.
 2015-03-14 09:47:47 -07:00
Andrew Meadows
2fad4153a9 remove unused Avatar::getBoundingRadius() 2015-03-12 16:34:27 -07:00
Andrew Meadows
feafa0a60b remove old Ragdoll and avatar interactions 2015-03-11 14:29:03 -07:00
Seth Alves
a8b688d540 move _velocity into base class. walking on a cube works 2015-03-04 15:26:02 -08:00
Brad Hefta-Gaub
b118912708 Merge pull request #4361 from samcake/temp0 
evolve the Transform stack away from the legacy GL to the brand new shader way
 2015-03-03 11:43:01 -08:00
Brad Hefta-Gaub
29340b6586 Merge pull request #4369 from ctrlaltdavid/20370 
CR for Job #20370 - Talk bubble fix - from a suggestion in https://worklist.net/20361
 2015-03-03 11:17:31 -08:00
Sam Gateau
ea88cbd75f Merge with upstream master 2015-02-27 13:19:50 -08:00
Sam Gateau
d8ebb0c5b9 Merge branch 'master' of https://github.com/highfidelity/hifi into temp0 2015-02-26 14:19:23 -08:00
David Rowe
21f12c1d6c Use cache ID when rendering talk bubble sphere 2015-02-26 13:50:43 -08:00
Ryan Huffman
e42b708b56 Update deferredLightingEffect::add*Light methods 2015-02-26 11:03:47 -08:00
Sam Gateau
04a39275ef Trying to setup correctly the projection matrix for all the different cases... 2015-02-23 16:47:43 -08:00
Sam Gateau
90bff36fd3 trying to ge the shadow to render correctly 2015-02-22 18:48:48 -08:00
Ryan Huffman
5c3cae471b Fix avatar billboards all rendering as the same billboard 2015-02-20 09:48:04 -08:00
Stephen Birarda
219e78425b resolve conflicts on merge with upstream master 2015-02-06 09:49:46 -08:00
Brad Davis
230d761ec3 fix display name scaling 2015-02-05 10:47:35 -08:00
Brad Davis
cb7f4ca672 Pre-pull checking 2015-02-03 23:06:09 -08:00
Brad Davis
60317b3526 Working on signed distance fields text rendering 2015-01-31 21:42:54 -08:00
Atlante45
4562c29be8 Merge branch 'master' of https://github.com/highfidelity/hifi into android 
Conflicts:
	interface/src/avatar/Hand.cpp
 2015-01-30 12:02:11 -08:00
Atlante45
647a935eaa Remove app->getAvatar 2015-01-29 15:16:40 -08:00
ZappoMan
2f4e98082b remove glColor calls related to text rendering 2015-01-28 13:54:48 -08:00
Atlante45
4ef87b9919 Merge branch 'master' of https://github.com/highfidelity/hifi into android 
Conflicts:
	interface/src/Application.cpp
	interface/src/Application.h
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/ui/PreferencesDialog.cpp
	interface/src/ui/Stats.cpp
	libraries/audio-client/src/AudioClient.cpp
	libraries/audio-client/src/AudioClient.h
 2015-01-28 13:13:32 -08:00
ZappoMan
7d9de6d0eb added some TODO comments and some cleanup 2015-01-28 11:03:05 -08:00
ZappoMan
4a6cc5c6f2 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/ui/overlays/ImageOverlay.cpp
 2015-01-27 16:44:11 -08:00
Atlante45
4fce5113dd Use DM to access AvatarHashMap/Manager 2015-01-23 11:50:27 -08:00
Atlante45
88872825fa Don't call settings in render loop 2015-01-20 10:56:58 -08:00
Atlante45
6a00dcbf0a More switches to new Settings 2015-01-20 00:30:29 -08:00
ZappoMan
bddb7856af more work 2015-01-19 13:34:09 -08:00
Atlante45
3fbc8c5d44 Moved Menu::shouldRenderMesh() to LODManager 2015-01-17 17:56:33 -08:00
Atlante45
a9047b7b15 LODManager class 
Moved most LOD related members in menu to new Dependency
LODManager
	Replaced all Menu::getInstance() call that accessed those
members by DM gets
 2015-01-16 17:55:47 -08:00
ZappoMan
db94949649 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 
Conflicts:
	interface/src/avatar/SkeletonModel.cpp
 2015-01-14 17:55:03 -08:00
ZappoMan
e6388a65b9 rough pass at adding color to geometry cache 2015-01-13 20:53:05 -08:00
Atlante45
2a82ff9768 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11 
Conflicts:
	assignment-client/src/voxels/VoxelServer.cpp
	interface/src/Application.cpp
	interface/src/Audio.cpp
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
	libraries/networking/src/NodeList.cpp
	libraries/shared/src/DependencyManager.h
 2015-01-13 11:03:14 -08:00
ZappoMan
925b13cc93 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-09 09:19:53 -08:00
ZappoMan
a03c2b79fa first cut at adding colors to GeometryCache and supporting batch internally 2015-01-08 15:52:33 -08:00
Atlante45
e73f8baf93 Merge branch 'master' of https://github.com/highfidelity/hifi into head_rotation_fix 2015-01-08 11:54:54 -08:00
Atlante45
0bae05b924 Remove chat message 2015-01-08 11:25:53 -08:00
ZappoMan
1bfce7d876 more removal of immediate mode 2015-01-06 14:14:13 -08:00
ZappoMan
bd1612f6a4 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2015-01-05 16:51:31 -08:00
ZappoMan
8b22b166ac convert lookat vectors and laser pointers to use renderLine() 2015-01-05 16:06:35 -08:00
ZappoMan
141e231958 more work on voxelEctomy 2014-12-30 18:41:56 -08:00
ZappoMan
4ea9bbc309 first major pass at voxelEctomy 2014-12-30 18:08:58 -08:00
ZappoMan
fbfa40e3c9 remove hair 2014-12-30 13:44:25 -08:00
ZappoMan
a4520f6a07 Merge branch 'master' of https://github.com/highfidelity/hifi into gpuStreamizing 2014-12-30 10:27:06 -08:00
dev
c99ad77799 fixing the size of the name displayed on screen 2014-12-29 16:45:14 -08:00
ZappoMan
3d42d532e4 more work on removing immediate mode GL_QUADS 2014-12-22 17:43:02 -08:00
ZappoMan
1db1914a2e replace gluProject() with just the math 2014-12-19 13:46:33 -08:00
Brad Hefta-Gaub
821cbe610c Merge pull request #3975 from ctrlaltdavid/20212 
CR for Job #20212 - Operate laser pointer with hands controlled by Leap Motion
 2014-12-19 09:55:45 -08:00
ZappoMan
2be3b73e8c move TextRender to libraries/render-utils 2014-12-17 12:32:52 -08:00
ZappoMan
fc1e1ecfc0 move DeferredLightingEffect and AmbientOcclusionEffect to libraries, make them DependencyManager enabled 2014-12-16 11:27:44 -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
ZappoMan
bfcc78c57d replaced Application::resourcesPath() with PathUtils::resourcesPath() 2014-12-15 15:20:18 -08:00
ZappoMan
7b973453b4 move TextureCache to library 2014-12-15 13:14:16 -08:00
ZappoMan
e0a017e963 make GeometryCache work with DependancyManager 2014-12-15 10:49:34 -08:00
ZappoMan
3de3540ebe move back into interface for now 2014-12-15 08:37:33 -08:00
ZappoMan
4ac673fe63 more render util cleanup 2014-12-15 08:16:42 -08:00
ZappoMan
e253b8afa4 move TextureCache out of interface and Application 2014-12-15 08:14:53 -08:00
David Rowe
fe8937e37e Make lasers able to emanate from index finger tips 2014-12-11 21:31:08 -08:00
ZappoMan
526664ac57 delete old dead code 2014-12-01 22:11:34 -08:00
Atlante45
4d5451fafe Merge branch 'master' of https://github.com/highfidelity/hifi into death_to_dot_f 
Conflicts:
	interface/src/avatar/Avatar.cpp
	interface/src/avatar/SkeletonModel.cpp
 2014-11-19 17:28:24 -08:00
Atlante45
ae3bcc8f06 No more .f 2014-11-19 16:53:39 -08:00
Brad Hefta-Gaub
7dd88eca08 Merge pull request #3829 from samcake/temp1 
refining the avatar display name rendering with different behavior if in...
 2014-11-19 16:39:04 -08:00
Brad Hefta-Gaub
0b7c3d3356 Merge pull request #3828 from AndrewMeadows/bispinor 
don't slide feet during idle animations
 2014-11-19 16:38:34 -08:00
dev
fc54ad93b8 refining the avatar display name rendering with different behavior if in HMD mode or not 2014-11-19 11:46:59 -08:00
Andrew Meadows
6673d9d0c2 avatar stands on lowest toe 2014-11-19 09:13:24 -08:00
dev
2e19ad48a7 ready for pull request 2014-11-19 00:50:59 -08:00
dev
4028e66c08 trying to fix the lighting issue in stereo and fix the display name size and orientation 2014-11-18 18:59:54 -08:00
David Rowe
8e58e6e3b0 Remove unused methods 2014-10-31 12:48:30 -07:00
Andrew Meadows
e631ab8d38 use Qt::AutoConnection for Avatar::setFoo() methods 
This prevents a JS script from blocking when setting C++ values.
 2014-10-29 13:01:47 -07:00
Andrew Meadows
f25cfc0c7f remove debug code 2014-10-27 10:22:40 -07:00
Andrew Meadows
c1728c0296 Merge upstream/master into andrew/experimental 2014-10-27 10:08:48 -07:00
Philip Rosedale
d5d0fbd9d8 Hair gravity always the same 2014-10-24 16:08:01 -07:00
ZappoMan
fc507850be Merge branch 'master' of https://github.com/highfidelity/hifi into removeParticles 2014-10-16 20:36:28 -07:00
AndrewMeadows
8372975bad Merge pull request #3582 from PhilipRosedale/master 
'Ribbons' that are driven by audio loudness and tuned/draped for mask avatars
 2014-10-15 14:08:20 -07:00
samcake
e7af0cbe7f Using the correct scaling factor for the avatar display name call. CHanged the scale coming from the widget.devicePixelRatio to the actual RenderResolutionScale we assign in the Application 2014-10-14 00:08:29 -07:00
ZappoMan
4c85e9f581 removing particles 2014-10-13 14:10:57 -07:00
Philip Rosedale
9be2b33971 Hair draped for masks and driven by audio loudness 2014-10-10 17:06:11 -07:00
Sam Gateau
ba2d072a65 fix syntax issues for constant names and the CmakeLists.txt useless change 2014-10-06 12:15:36 -07:00
Andrew Meadows
01a3eaa26b added experimental MyAvatar.setSkeletonOffset() 
for improved walk animations
 2014-10-05 19:10:55 -07:00
Sam Gateau
738369e21f Replacing glutSolidSphere by a cached Geometry 
Instead of calling glutSolidSphere, just call Application::getInstance()->getGeometryCache()->renderSphere(...)

- replaced all the instances of "glutSolidSphere"
- Changed the atmosphere shaders so instead of drawing a sphere of the size of the atmosphere, we draw a unit sphere, the vertices get scaled at the right radius in th vertex shader using  fOuterRadius
 2014-10-03 16:55:58 -07:00
Andrzej Kapolka
9855fbcfb4 Don't bother using a callback to render the eye vectors; just rely on the 
post-lighting call to Avatar::render, like everything else.  This should fix
the crash that Philip was seeing (presumably due to avatars' being deleted
during the draw process).
 2014-09-29 11:45:12 -07:00
Andrzej Kapolka
efa22d931f If we're rendering the billboard, don't render the body. 2014-09-26 13:48:11 -07:00
Andrzej Kapolka
18cb15ee7d Warning fixes. 2014-09-22 15:31:46 -07:00
Andrzej Kapolka
aeb424cd71 Fix for billboards. 2014-09-22 15:01:39 -07:00
AndrewMeadows
3d89aa9c9c Merge pull request #3463 from ey6es/deference 
Break deferred lighting business out into its own class, use deferred lighting for voxels/avatars/entities/particles in addition to metavoxels.  Don't merge until after conference, obviously.
 2014-09-22 10:42:25 -07:00
Atlante45
c570931f35 Fix attachemnt getting into wrong state 
If you play a recording containing attachement with different
attachemnts already on, those attachement will sometime get into a wrong
state.
 2014-09-19 15:43:22 -07:00
Andrzej Kapolka
8d3eef708a Move various avatar render bits to post-lighting section. 2014-09-19 13:13:05 -07:00
Andrzej Kapolka
08fda3bbef Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-19 10:30:40 -07:00
Andrzej Kapolka
e356b06c75 Fix for lights in rear view mirror/head mode. 2014-09-18 17:39:40 -07:00
Andrzej Kapolka
c6aad42f21 Move LocalLight to AvatarManager, apply it at the avatar level. 2014-09-18 17:09:53 -07:00
Andrzej Kapolka
c54e1c937c Merge branch 'master' of https://github.com/highfidelity/hifi into deference 
Conflicts:
	interface/src/avatar/Head.cpp
 2014-09-18 13:08:55 -07:00
Philip Rosedale
3f9eff2a90 Merge branch 'master' of https://github.com/worklist/hifi 2014-09-18 10:48:44 -07:00
Philip Rosedale
8c71ed3f10 Improving headMove, added JS call for neckPosition 2014-09-18 10:48:36 -07:00
stojce
a6a48aafdc Hide name for all avatars, including MyAvatar 2014-09-18 07:34:14 +02:00
stojce
9a523a60cf Add option to toggle on/off names above heads 2014-09-18 06:59:29 +02:00
Andrzej Kapolka
ce9ecba5d8 Merge branch 'master' of https://github.com/highfidelity/hifi into deference 
Conflicts:
	interface/resources/shaders/model.frag
	interface/resources/shaders/model_cascaded_shadow_map.frag
	interface/resources/shaders/model_cascaded_shadow_normal_map.frag
	interface/resources/shaders/model_cascaded_shadow_normal_specular_map.frag
	interface/resources/shaders/model_cascaded_shadow_specular_map.frag
	interface/resources/shaders/model_normal_map.frag
	interface/resources/shaders/model_normal_specular_map.frag
	interface/resources/shaders/model_shadow_map.frag
	interface/resources/shaders/model_shadow_normal_map.frag
	interface/resources/shaders/model_shadow_normal_specular_map.frag
	interface/resources/shaders/model_shadow_specular_map.frag
	interface/resources/shaders/model_specular_map.frag
	interface/src/renderer/Model.cpp
	interface/src/renderer/Model.h
 2014-09-17 13:50:13 -07:00
AndrewMeadows
42a84b7ff1 Merge pull request #3429 from ctrlaltdavid/20021 
Code Review for Job #20021
 2014-09-17 09:19:29 -07:00
Andrzej Kapolka
07efda89ef Merge branch 'master' of https://github.com/highfidelity/hifi into deference 2014-09-16 13:20:43 -07:00
David Rowe
a594136a9a Fix up hand roll, pitch, and yaw as best able for now 2014-09-15 20:12:13 -07:00
David Rowe
3ddd5854cd Position avatar hands with Leap Motion with no roll, pitch or yaw 2014-09-14 15:03:22 -07:00
Andrew Meadows
f2882618be merge upstream/master into andrew/inertia 
Conflicts:
	interface/src/avatar/MyAvatar.cpp
 2014-09-12 17:50:26 -07:00
Andrzej Kapolka
53933fc9c6 Working on deferred lighting for models. 2014-09-12 17:09:07 -07:00
Andrew Meadows
93864ee869 fix velocity drift of MyAvatar 2014-09-11 15:03:11 -07:00
Andrzej Kapolka
de8dd4cecc Share instances of TextRenderer. 2014-09-10 18:55:36 -07:00
Andrew Meadows
4da1ca22ba Add RayIntersectionInfo and use for shape-vs-ray 2014-09-09 17:35:06 -07:00
Andrzej Kapolka
f69324f270 Fix for display name. 2014-09-08 15:29:36 -07:00
Andrzej Kapolka
f2535d4df8 Adjust avatar names for device pixel ratio. 2014-09-08 15:23:08 -07:00
Andrew Meadows
15025bf8d8 fix for flickering avatars 2014-09-08 13:08:08 -07:00
Andrew Meadows
bd8fc75305 fix bug: zero velocity when teleporting to new locations 2014-09-05 17:51:18 -07:00