Stephen Birarda
2b49442039
resolve conflicts on merge with upstream master
2013-04-15 18:34:40 -07:00
Stephen Birarda
c6f8cc50a9
Merge remote-tracking branch 'upstream/master'
2013-04-15 18:34:18 -07:00
Stephen Birarda
a5a93443c6
re-work AvatarData to handle body position and rotation
2013-04-15 18:05:22 -07:00
Jeffrey Ventrella
1e388347dc
yargh
2013-04-15 18:03:34 -07:00
Jeffrey Ventrella
fc8c0498cf
adjusted avatar height and camera up to compensate - improves navigation
2013-04-15 16:16:05 -07:00
Stephen Birarda
ed3f308a0e
pass ROOT_DIR to IncludeGLM macro instead of MACRO_DIR, include glm for AM
2013-04-15 16:08:35 -07:00
Stephen Birarda
a4011934c6
move Orientation class to avatars library, constants to SharedUtil
2013-04-15 15:39:23 -07:00
Jeffrey Ventrella
99c2480642
small tweaks to get ready for bigger tweaks in avatar bone logic
2013-04-15 15:29:49 -07:00
Jeffrey Ventrella
427253b8b0
cleaned up formatting in Head
2013-04-15 15:05:30 -07:00
Stephen Birarda
4702e6ade0
remove the unecessary trailing slash when setting root dir
2013-04-15 14:59:48 -07:00
Jeffrey Ventrella
e97383be2e
updated many aspects of the avatar hand motion as determined by mouse motion and mouse click
2013-04-15 14:58:32 -07:00
Stephen Birarda
d0eed92699
add an avatars library and move AvatarAgentData there
2013-04-15 14:51:34 -07:00
Jeffrey Ventrella
574ab04e09
Merge remote-tracking branch 'origin/master'
2013-04-15 12:06:48 -07:00
ZappoMan
bd837862de
fixed lighting when in frustum render mode
2013-04-13 16:16:10 -07:00
ZappoMan
e6a1fb416d
improved the menu states names for frustum rendering modes
2013-04-13 15:58:10 -07:00
ZappoMan
e429dfe61f
fixed bug in rendering menu rows where state was longer than 5 characters
2013-04-13 15:57:30 -07:00
ZappoMan
37322fcb73
Many menu improvements, and some render_view_frustum() improvements
...
- Added menu items for Quit, Voxels, Stars, Frustum features, etc.
- Added FrustomDrawMode enhancements to render_view_frustum()
2013-04-13 15:20:21 -07:00
ZappoMan
e921d06877
Added new feature to MenuRow to allow custom callback for State
...
Note: there's some bug in the menu render code that doesn't like state strings
that are longer than 4 characters + NULL. So, the current code will clip any
state string that is longer than 4 characters. We need to look into this 5
character limit. It's a bug.
2013-04-13 15:18:19 -07:00
ZappoMan
093f489520
make menu columns render properly for menu items wider than 100 pixels
2013-04-13 13:07:02 -07:00
Philip Rosedale
98c8228161
had to take out call to myAvatar.getBonePosition - unclear why it now isn't working.
2013-04-12 21:11:03 -07:00
Philip Rosedale
d5d746ff9e
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-12 21:01:15 -07:00
Philip Rosedale
1d69acef56
Removed hand class files, relocated transmitter receiver function to Head.h
2013-04-12 21:01:01 -07:00
Jeffrey Ventrella
ca05823010
added some smoothness to the camera
2013-04-12 18:06:11 -07:00
ZappoMan
7c7c931e83
fixed build buster after merge
2013-04-12 17:10:04 -07:00
ZappoMan
98904d84ff
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
...
Conflicts:
interface/src/Head.cpp
2013-04-12 17:02:11 -07:00
ZappoMan
5a8c5ff011
coding standards clean up
2013-04-12 16:55:57 -07:00
Jeffrey Ventrella
6ddebd523c
cleaned up Orientation calls to right, up, front
2013-04-12 16:52:31 -07:00
ZappoMan
5504d87212
Merge and Cleanup
...
-Cleanup glmUtils(as in, get rid of it)
-Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
2013-04-12 16:32:46 -07:00
Philip Rosedale
5368cbf79a
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-12 16:15:01 -07:00
Philip Rosedale
6d7f343be8
draw a test sphere around my hand in orldspace
2013-04-12 16:13:40 -07:00
Jeffrey Ventrella
5cb0d84990
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-12 16:12:54 -07:00
Jeffrey Ventrella
84ca2dcb32
added get avatar bone
2013-04-12 16:12:31 -07:00
Stephen Birarda
cc2f35ca89
pass a ROOT_DIR to LinkHifiLibrary
2013-04-12 15:59:16 -07:00
Philip Rosedale
524ed7deb6
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-12 15:35:02 -07:00
ZappoMan
25f1f1ae3f
include glmUtils.h so that we get vec3 opertator*
2013-04-12 15:08:57 -07:00
ZappoMan
77996fb140
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
2013-04-12 15:06:41 -07:00
ZappoMan
d568cce0cd
changed interface to use ViewFrustum class for rendering view frustum
...
- updated ViewFrustum class to work correctly
- added new keyboard interface to adjust offset camera position and up
- removed keyboard interface for local add sphere, since we don't need that anymore
2013-04-12 15:01:48 -07:00
Jeffrey Ventrella
15c9053fac
Merge branch 'master' of https://github.com/worklist/hifi
2013-04-12 15:01:38 -07:00
Jeffrey Ventrella
265fcc6095
a few small fixes on the avatar springs
2013-04-12 15:00:48 -07:00
ZappoMan
cf6b8fe72f
Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work
2013-04-12 13:37:34 -07:00
ZappoMan
d01d1164ca
latest view frustum work
2013-04-12 13:36:44 -07:00
Stephen Birarda
aff3732052
some light refactoring in interface CMakeLists
2013-04-12 13:29:27 -07:00
Stephen Birarda
b0ff960e37
use MACRO_DIR variable to find glm in root externals dir
2013-04-12 13:20:46 -07:00
Stephen Birarda
67efc12e59
move shared to libraries, DRY library macro, rename libs
2013-04-12 12:38:34 -07:00
ZappoMan
76d22f1b2b
more angle tweaks
2013-04-12 11:34:10 -07:00
ZappoMan
7f1ba5c733
playing around with fov angle
2013-04-12 11:26:32 -07:00
Philip Rosedale
dcacad3755
Removed unneeded GLenable cruft
2013-04-12 10:02:41 -07:00
ZappoMan
b34d1b5c05
more moving around of things
2013-04-11 18:56:46 -07:00
ZappoMan
85bef98f4a
Merge branch 'master' of https://github.com/worklist/hifi into voxel_lod_fixes
2013-04-11 18:42:12 -07:00
ZappoMan
4364a0e692
moved stuff around to migrate glm to shared
2013-04-11 18:41:12 -07:00
