53 commits

Author	SHA1	Message	Date
Jeffrey Ventrella	2b31e79a0b	cleanup	2013-05-26 15:23:44 -07:00
Jeffrey Ventrella	883d21a5e4	added facing other av requirement for camera shift to 1p; improved ease-in/out for camera mode shift; did some clean up on the camera code	2013-05-26 15:17:58 -07:00
Jeffrey Ventrella	3c3a3fc82e	cleaning up look at code - Stephen helped find a transmission bug - fixed.	2013-05-22 13:12:11 -07:00
Andrzej Kapolka	58a9a05ef7	Merge branch 'master' of https://github.com/worklist/hifi	2013-05-17 10:17:37 -07:00
Andrzej Kapolka	3ed99f40a6	Working on support for off-axis projection.	2013-05-17 10:17:21 -07:00
Jeffrey Ventrella	ade5b7bec3	formatting changes	2013-05-17 09:52:19 -07:00
Jeffrey Ventrella	7e0877e753	cleanup	2013-05-17 08:48:54 -07:00
Jeffrey Ventrella	04828c8224	cleaned up copyright header notifications in several files	2013-05-16 12:06:36 -07:00
Jeffrey Ventrella	acda87502e	more work on camera shifting between modes	2013-05-14 11:43:51 -07:00
Jeffrey Ventrella	54010d36c4	created transitions between camera modes	2013-05-13 16:53:45 -07:00
Jeffrey Ventrella	08aba4decb	fixed problem of camera shifting when application starts (made camera jump to ideal position/rotation when initialized)	2013-05-11 11:48:00 -07:00
Stephen Birarda	2f9c16f495	have the oculus drive the body yaw, head pitch, and head roll	2013-05-10 10:55:26 -07:00
Stephen Birarda	cc38e4c5c4	Merge remote-tracking branch 'upstream/master' into oculus	2013-05-10 10:18:36 -07:00
Stephen Birarda	04447dfcbd	drive body yaw and render pitch with oculus when connected	2013-05-10 10:17:21 -07:00
Jeffrey Ventrella	6254a6886f	cleaned up camera code and improved first person mode	2013-05-09 22:11:33 -07:00
Jeffrey Ventrella	8ecfbce15e	fixed some small formatting things	2013-05-09 14:00:40 -07:00
Jeffrey Ventrella	e923f5446d	clean up	2013-05-09 11:22:24 -07:00
Jeffrey Ventrella	fe11d929e3	cleaned up code spacing	2013-05-07 08:43:14 -07:00
ZappoMan	5253485261	added TREE_SCALE to default camera farClip	2013-05-04 07:46:42 -07:00
Jeffrey Ventrella	b388e9a760	(1) re-designed and debugged the orientation class and cleaned up quaternion code, and fixed issues in camera and main related to yaw and camera transforms (2) improved hand-holding algorithm	2013-05-01 13:00:08 -07:00
Jeffrey Ventrella	2486b6e15c	moved inline functions from Camera.h to Camera.cpp as per Stephen's request	2013-04-26 13:33:36 -07:00
Jeffrey Ventrella	86e72a90d4	working on camera view shifting from first person to third person	2013-04-25 16:31:42 -07:00
Jeffrey Ventrella	7a0ed469b8	added methods to camera class to check for when the view frustum needs to be reshaped (but the calls are not yet being made - need to make sure the right place to use it)	2013-04-25 14:25:28 -07:00
Jeffrey Ventrella	5a0a1c1cec	increased YAW_MAG (faster turning), redesigned the concept of avatar position, and reset Eve's position accordingly. Also added _frustumNeedsReshape in camera in anticipation of fixing problem where setting fov doesn't reshape the frustum.	2013-04-25 13:51:20 -07:00
Jeffrey Ventrella	9a4d27c0b5	cleaned up some camera code and added some functionality for first-person view	2013-04-25 12:19:23 -07:00
tosh	349e89aaa6	integrates logging for interface	2013-04-17 19:04:10 +02:00
Jeffrey Ventrella	bd7c4273c3	tested camera orthonormals	2013-04-16 22:47:04 -07:00
ZappoMan	7a239fc7f0	Small tweaks to initial values for offset camera, so people can make sense of it	2013-04-16 20:25:08 -07:00
Jeffrey Ventrella	f766843b7a	adjusted the ordering of porcessed in camera update method	2013-04-16 18:27:19 -07:00
Jeffrey Ventrella	dcd6aafb77	trying to get around git confusion	2013-04-16 15:54:20 -07:00
Jeffrey Ventrella	fc5d412e53	fixed idealYaw issue	2013-04-16 15:51:22 -07:00
ZappoMan	4f5ddb3700	fixed yaw/ideal yaw problem correctly	2013-04-16 15:46:20 -07:00
ZappoMan	edfb1501f1	fixed merge problem with shifted avatar	2013-04-16 15:41:38 -07:00
Jeffrey Ventrella	fcbf44cad9	trying to get around git confusion	2013-04-16 15:11:23 -07:00
Jeffrey Ventrella	0c85f832e6	trying to get around git confusion	2013-04-16 14:56:49 -07:00
birarda	7ef80b37be	Merge pull request #55 from ZappoMan/view_frustum_work ... Latest view frustum work	2013-04-16 14:53:48 -07:00
Stephen Birarda	2f5d5398b2	comment cleanup in Camera.cpp	2013-04-16 14:39:23 -07:00
ZappoMan	0ff88b882b	tweaks to default Camera near clip, and camera positions in interface	2013-04-16 14:06:48 -07:00
Jeffrey Ventrella	1bef9544d9	Merge remote-tracking branch 'origin/master'	2013-04-16 13:56:45 -07:00
Jeffrey Ventrella	216cc465e7	Added idealYaw to camera and also switched ordering of gl camera rotation commands	2013-04-16 13:51:14 -07:00
Stephen Birarda	1dd21a450e	Merge remote-tracking branch 'upstream/master'	2013-04-16 12:00:55 -07:00
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
ZappoMan	47a4211257	Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work ... Conflicts: interface/src/Camera.cpp interface/src/Camera.h interface/src/main.cpp	2013-04-15 18:05:35 -07:00
ZappoMan	c2c36e6cea	Tweaks to Camera class ... - added lens attributes - coding standard cleanup	2013-04-15 17:56:52 -07:00
Stephen Birarda	a4011934c6	move Orientation class to avatars library, constants to SharedUtil	2013-04-15 15:39:23 -07:00
Jeffrey Ventrella	ca05823010	added some smoothness to the camera	2013-04-12 18:06:11 -07:00
Jeffrey Ventrella	265fcc6095	a few small fixes on the avatar springs	2013-04-12 15:00:48 -07:00
Jeffrey Ventrella	f294cc8782	working on avatar orientation issues	2013-04-10 21:12:15 -07:00
Jeffrey Ventrella	09af8d153f	added camera modes and also set initial avatar yaw to 90	2013-04-09 15:05:37 -07:00