Commit graph

1345 commits

Author SHA1 Message Date
tosh
bf5f54c9d0 integrates logging for 'avatars' library, fixes missig return in Log.cpp, adds _lib suffix for log callback namespaces and reverts voxels -> voxLib rename in main 2013-04-17 20:14:29 +02:00
tosh
f899ff9378 adds logging support to voxels library 2013-04-17 20:01:58 +02:00
tosh
c261449937 Merge branch 'master' of git://github.com/worklist/hifi into 19262 2013-04-17 20:01:51 +02:00
Jeffrey Ventrella
851b833d35 Merge remote-tracking branch 'upstream/master' 2013-04-17 11:25:35 -07:00
Jeffrey Ventrella
3cee28f0ef added back the av position 2013-04-17 11:23:47 -07:00
Philip Rosedale
e558f45426 Merge pull request #63 from Ventrella/master
fixed orientation contrstuctor
2013-04-17 11:21:50 -07:00
ZappoMan
62d787c434 Merge pull request #62 from birarda/master
fixing mutex movement when re-sizing AgentList vector
2013-04-17 11:18:45 -07:00
Jeffrey Ventrella
53796d067f changed Ori constructor to include setIdentity 2013-04-17 11:11:05 -07:00
tosh
4ddbbd6209 fixes misplaced include .h -> .cpp 2013-04-17 20:01:33 +02:00
Stephen Birarda
0768785cfd fix mutex movement when resizing AgentList vector 2013-04-17 11:01:08 -07:00
tosh
493fafb213 adds optional LogStream for cpp iostream-style logging 2013-04-17 19:48:30 +02:00
tosh
e55863a662 integrates logging for 'shared' library 2013-04-17 19:46:00 +02:00
tosh
349e89aaa6 integrates logging for interface 2013-04-17 19:04:10 +02:00
tosh
e7810179de reduces default character size 2013-04-17 19:03:39 +02:00
tosh
81cae86559 brings logging component to stable state 2013-04-17 18:35:10 +02:00
tosh
4fa5760162 Merge branch 'master' of git://github.com/worklist/hifi into 19262
Conflicts:
	interface/src/Util.cpp
2013-04-17 18:34:43 +02:00
Philip Rosedale
a6f8d5dc62 Merge pull request #61 from ZappoMan/view_frustum_work
Adding testOrientationClass() to run unit tests on the orientation class
2013-04-17 08:17:03 -07:00
ZappoMan
184d28e905 Adding testOrientationClass() to run unit tests on the orientation class. 2013-04-17 00:42:49 -07:00
Jeffrey Ventrella
a6f82e1236 moved renderOrientstionDiretions to Utils 2013-04-16 23:39:43 -07:00
Jeffrey Ventrella
bd7c4273c3 tested camera orthonormals 2013-04-16 22:47:04 -07:00
Jeffrey Ventrella
f8d7b84a67 Merge remote-tracking branch 'origin' 2013-04-16 20:36:03 -07:00
Jeffrey Ventrella
1fb8d0b268 consolidated some code in Head.cpp 2013-04-16 20:35:50 -07:00
birarda
36559becb2 Merge pull request #60 from ZappoMan/view_frustum_work
Small tweaks to initial values for offset camera, so people can make sen...
2013-04-16 20:28:46 -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
tosh
9ea3c58087 removes leftover #include 2013-04-17 05:06:28 +02:00
Jeffrey Ventrella
e825764304 added instrumentation to Orientation class to test for normalized and orthogonal vectors 2013-04-16 19:53:48 -07:00
Jeffrey Ventrella
1db06a8399 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-16 18:27:26 -07:00
Jeffrey Ventrella
f766843b7a adjusted the ordering of porcessed in camera update method 2013-04-16 18:27:19 -07:00
birarda
c4eb46819b Merge pull request #59 from birarda/master
fix number of bytes per agent from avatar mixer
2013-04-16 18:11:35 -07:00
Stephen Birarda
d0a83f3c0e correct the number of bytes per agent from avatar mixer 2013-04-16 18:09:27 -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
7475887939 Merge pull request #58 from ZappoMan/view_frustum_work
fixed yaw/ideal yaw problem correctly
2013-04-16 15:50:52 -07:00
tosh
3be23b3faa integrates logging 2013-04-17 00:48:27 +02:00
ZappoMan
4f5ddb3700 fixed yaw/ideal yaw problem correctly 2013-04-16 15:46:20 -07:00
birarda
dd992c1dec Merge pull request #57 from ZappoMan/view_frustum_work
fixed merge problem with shifted avatar
2013-04-16 15:45:55 -07:00
ZappoMan
edfb1501f1 fixed merge problem with shifted avatar 2013-04-16 15:41:38 -07:00
tosh
ba4f6bc92c Merge branch 'master' of git://github.com/worklist/hifi into 19262 2013-04-17 00:40:37 +02:00
tosh
e811410f77 works around GLUT bugs related to monospace glyphs 2013-04-17 00:39:35 +02:00
tosh
dc4dc887ac silences warning about deprecated conversion of string literal to char* 2013-04-17 00:38:39 +02:00
tosh
cf3e2635c1 brings Log class into stable state 2013-04-17 00:38:21 +02:00
tosh
58b40f7ed2 adds Log class 2013-04-17 00:37:21 +02: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
birarda
ab73b67541 Merge pull request #56 from birarda/master
comment fixes in Camera.cpp
2013-04-16 14:40:09 -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