Commit graph

267 commits

Author SHA1 Message Date
Brad Hefta-Gaub
7536fed09a more warning fixes 2015-09-22 17:22:09 -07:00
Bradley Austin Davis
e024d23366 Instancing work, second pass 2015-09-21 13:27:02 -07:00
Andrew Meadows
e85cdad8c7 remove DependencyManager fetch of backpointer 2015-09-11 16:27:50 -07:00
Andrew Meadows
ebadebbc87 render wireframe sphere for debug finger tip 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
Andrew Meadows
6657026a12 remove cruft: legacy shapes for skeleton bones 2015-07-23 08:34:44 -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
ericrius1
8b00864175 hydra hand spheres and lasers are rendering again 2015-07-01 15:04:19 -07:00
Ryan Huffman
3f22b5f8b3 Add RenderArgs to more render methods 2015-05-22 15:25:53 -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
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
018b38e56d fix warning 2015-01-28 18:51:10 -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
4278407137 Account for avatar scale in Hand(Data) get/set
When using localToWorld/WorldToLocal type functions
2015-01-26 16:48:33 -08:00
ZappoMan
e6388a65b9 rough pass at adding color to geometry cache 2015-01-13 20:53:05 -08:00
ZappoMan
11b4400099 move all glut-ness to geometry cache 2014-12-18 11:20:17 -08:00
ZappoMan
0c14b0f8fc windows build hackery 2014-12-15 14:47:26 -08:00
ZappoMan
df7e115556 move ProgramObject to libraries 2014-12-15 14:21:22 -08:00
ZappoMan
e0a017e963 make GeometryCache work with DependancyManager 2014-12-15 10:49:34 -08:00
ZappoMan
4ac673fe63 more render util cleanup 2014-12-15 08:16:42 -08:00
Atlante45
ae3bcc8f06 No more .f 2014-11-19 16:53:39 -08:00
Sam Gateau
4f26c9e0fa fix formatting and syntax issues 2014-10-06 11:06:23 -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
Atlante45
35caef1882 Added pointing behaviour 2014-07-18 15:39:12 -07:00
barnold1953
8bc9214445 Added helper scaling function to Avatar. 2014-07-10 14:37:04 -07:00
barnold1953
fc21f7bbac Removed outdated and incorrect getFingerTipPosition() 2014-07-10 14:21:17 -07:00
barnold1953
45421ffb0e Made palm ball and disk properly use avatar scale 2014-07-10 12:06:36 -07:00
Andrew Meadows
8986be5f1c remove old collideAgaintsOurself() code 2014-06-23 10:36:31 -07:00
Andrew Meadows
ca77eb9d1e cleanup of avatar collisions, prep for more ragdoll collisions
removal of paddle hands
particles use general sphere collision path against avatars
temp removal of skeleton self collision
2014-06-06 10:51:22 -07:00
Andrew Meadows
6efa417742 move hand/arm stuff from Model to SkeletonModel 2014-05-27 15:06:50 -07:00
Andrew Meadows
aad9d0441e merge upstream/master to andrew/bispinor
Conflicts:
	interface/src/avatar/Hand.cpp
	interface/src/avatar/SkeletonModel.cpp
	libraries/avatars/src/HandData.cpp
	libraries/avatars/src/HandData.h
2014-05-14 09:38:31 -07:00
Andrew Meadows
366e9c7d34 PalmDataA::getPalmDirection --> getNormal() 2014-05-14 09:05:54 -07:00
Andrew Meadows
607094075c Revert "Merge pull request #2834 from andrew/thermonuclear"
This reverts commit e088c3d115, reversing
changes made to d124c0319d.
2014-05-13 10:38:56 -07:00
Brad Hefta-Gaub
e088c3d115 Merge pull request #2834 from AndrewMeadows/thermonuclear
remove leap fingers
2014-05-13 08:04:40 -07:00
Andrew Meadows
a1a5372b74 add missing glPushMatrix() 2014-05-12 14:07:33 -07:00
Andrew Meadows
49dedb72c9 remove FingerData class and related cleanup 2014-05-12 11:09:12 -07:00
Andrew Meadows
217080fe1d cleanup - remove unused leap fingers 2014-05-09 10:27:01 -07:00
Philip Rosedale
8f4fb04021 clearer visualization of controller hand target, remove hand paddles 2014-05-07 22:24:05 -07:00
ZappoMan
37ca6efc7c correctly handle SHADOW_RENDER_MODE in a bunch of places that were drawing shadows when they shouldn't 2014-05-07 11:48:32 -07:00
Andrew Meadows
5ffd307926 Merge upstream/master into andrew/inertia
Conflicts:
	interface/src/avatar/MyAvatar.h
2014-05-05 13:54:25 -07:00
Andrew Meadows
ec65940212 remove debug #include <StreamUtils.h> 2014-05-05 12:34:56 -07:00
Philip Rosedale
eb991b60ce Remove dead ‘play slaps’ code 2014-05-03 09:08:26 -07:00
Andrew Meadows
22d2f84cff merge upstream/master into andrew/scripting 2014-04-09 15:38:56 -07:00
Andrew Meadows
07b343ec03 emit events for hand-avatar collisions 2014-04-09 14:32:57 -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
b65855a384 merge upstream/master into avatar-interaction 2014-04-01 12:53:47 -07:00
Andrew Meadows
1bbdc9d78b Adding bounding capsule shape for Model
Also:
Cleaned up the automatic geometry LOD loading
Removed staticExtents data member from FBXGeometry
Split debug rendering of bounding shapes from joint shapes
2014-04-01 09:25:25 -07:00
Andrew Meadows
c383b69b61 merge upstream/master into enforce-standard
Conflicts:
	interface/src/avatar/Hand.cpp
2014-03-27 10:53:54 -07:00