Commit graph

85 commits

Author SHA1 Message Date
Stephen Birarda
89d3cfdb6f remove now extraneous newlines after switch to QDebug 2013-07-16 11:16:51 -07:00
Stephen Birarda
afe49bc756 switch calls to printLog to QDebug 2013-07-16 11:07:22 -07:00
Mark Peng
24d32bcdc8 Fix style mistakes according to code review for eyecontact code. 2013-07-11 10:40:57 -07:00
Mark Peng
083e0e9d06 Merge remote-tracking branch 'upstream/master' 2013-07-11 10:20:41 -07:00
ZappoMan
3d3eca9afa Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-10 17:45:04 -07:00
Mark Peng
baf9edecc9 Merge remote-tracking branch 'upstream/master' 2013-07-10 16:51:53 -07:00
ZappoMan
6694ef3869 fixed some compiler warnings 2013-07-10 16:33:27 -07:00
Mark Peng
0b334f9e5d Make lookAtVectors lock on other avatar's eyes if the mouse is over
the other avatar's head.

Add rayIntersectsSphere function to Util. glm::intersectRaySphere was buggy.
2013-07-10 15:56:23 -07:00
Philip Rosedale
2e854b5ed7 Tune and smooth 'Touch Look' and always turned on, old mouseLook code removed. Add vec3 speed test. Smooth simulation by passing exact deltaTime to update() 2013-07-10 12:20:26 -07:00
ZappoMan
abd7dfde8b added vector math timing test 2013-07-10 11:10:03 -07:00
Andrzej Kapolka
ec0b1a99fb Fix iris orientations: start with the head orientation, then rotate onto the
lookat vector.  This way, the irises don't rotate around as we yaw.
2013-06-14 11:23:08 -07:00
Philip Rosedale
e32f9f387a Basic random eye movements added, and fixation on camera in mirror mode. 2013-06-13 13:50:56 -07:00
Andrzej Kapolka
52c616b688 Added configurable lean scale, fixed loadSetting. 2013-06-12 13:06:28 -07:00
ZappoMan
27f8f5dcb8 fix CR feedback 2013-06-10 14:50:04 -07:00
ZappoMan
fc3fb7d3f0 fixed bug with loading of corrupt settings file where NaN returned for avatar position details 2013-06-10 11:46:06 -07:00
Philip Rosedale
b5e63fb446 Added debug->run timing tests option to speed test some common functions (please add some more, bottom of util.cpp 2013-06-06 17:52:19 -07:00
Philip Rosedale
b08fe8f915 merge fixes 2013-06-06 10:07:50 -07:00
Philip Rosedale
24dcd14371 Added sensor fusion for more stable gyro roll, pitch. 2013-06-05 23:53:01 -07:00
Stephen Birarda
6c2dcb86c8 Merge remote-tracking branch 'upstream/master' into synthesis 2013-06-05 09:55:16 -07:00
ZappoMan
4f2af717f2 Fixed merge issue with new orientation vectors, migrated to common identity names 2013-06-04 17:27:40 -07:00
Andrzej Kapolka
73f8fca2af More work on voxeltars; added rotations. 2013-06-03 13:00:54 -07:00
Stephen Birarda
4348702dd2 Merge remote-tracking branch 'upstream/master' into synthesis 2013-06-03 11:53:13 -07:00
Stephen Birarda
2d7c397138 create a FreeVerb object for each other agent per agent 2013-05-31 15:47:57 -07:00
Andrzej Kapolka
3f6cf08b97 Removed remaining Orientation bits (and class itself), enforce limits on
head yaw/pitch/roll.
2013-05-30 15:15:12 -07:00
Andrzej Kapolka
d6855b6430 Massive changes to orientations: use quaternions rather than Orientation
class.
2013-05-29 19:05:33 -07:00
Andrzej Kapolka
26badc56e0 Added shadow and outline effects to TextRenderer, use the shadow effect in
our text to separate it from the background.
2013-05-16 16:10:38 -07:00
Jeffrey Ventrella
17c61c88c7 cleaned up avatar slow-down upon nearness; fixed mouse pressed bug; 2013-05-09 13:04:22 -07:00
ZappoMan
085bfa384a Merge pull request #225 from PhilipRosedale/master
Added perlin noise example function noiseTest()
2013-05-07 17:53:07 -07:00
ZappoMan
005b2fce35 Merge pull request #223 from Ventrella/master
cleaned up a bunch of spacings inside of parentheses
2013-05-07 17:51:43 -07:00
Philip Rosedale
331d4116d9 Finished noiseTest example (in util.h) that uses Perlin noise to draw a bitmap in 2D. 2013-05-07 11:14:12 -07:00
Philip Rosedale
be1b803656 Noise Test function, adjust chat position 2013-05-07 10:41:39 -07:00
Philip Rosedale
27540f1286 Fixes per code review 2013-05-07 09:59:37 -07:00
Jeffrey Ventrella
fe11d929e3 cleaned up code spacing 2013-05-07 08:43:14 -07:00
Philip Rosedale
c7635604a9 Fixes in merge. 2013-05-07 08:40:11 -07:00
Philip Rosedale
31593dccd4 improved comment of function 2013-05-06 18:46:19 -07:00
Philip Rosedale
00c8673ceb Added Utility function angleBetween() which returns the positive angle between any two 3D vectors. 2013-05-06 18:45:06 -07:00
Jeffrey Ventrella
22a0e39d6c more work on avatar touch, reachable radius, and hand states 2013-05-06 18:29:20 -07:00
Philip Rosedale
ff88d1fc06 Created a drawVector() call that will draw a vector in 3-space with axes for testing 2013-05-06 16:18:27 -07:00
Jeffrey Ventrella
707d513dac Merge remote-tracking branch 'upstream/master' 2013-05-03 16:12:01 -07:00
Jeffrey Ventrella
cb8e68f300 fixed a physics bug in avatar body spring (forgot to use deltaTime) - and adjusted various physics constants accordingly. 2013-05-03 16:11:35 -07:00
Jeffrey Ventrella
85ad5601d7 added avatar shadow 2013-05-03 15:22:01 -07:00
Stephen Birarda
90a08b4dd8 cleanup in Audio and Util 2013-05-03 14:45:47 -07:00
Philip Rosedale
9716ea9550 Ground plane moved to 0->10 and lines are exactly 1 meter 2013-05-02 22:28:41 -07:00
Andrzej Kapolka
11a750f6a0 Changes according to Philip's feedback: spacing around operators, removed
unused variables, moved font family names to #defines.
2013-05-01 12:17:57 -07:00
Andrzej Kapolka
068d3d216e Need to commit these, too, for the font rendering change. 2013-04-29 19:12:34 -07:00
Stephen Birarda
215efe3b78 bunch of const changes for glm::vec3 in Avatar and Orientation 2013-04-25 16:10:55 -07:00
Andrzej Kapolka
e02aaa39f7 To fix font rendering on Linux (which uses points), we need to restore the
default point size attenuation settings.
2013-04-24 14:59:11 -07:00
Philip Rosedale
8e19caf21c Merge remote-tracking branch 'upstream/master' 2013-04-18 07:23:06 -07:00
tosh
1e6352593a Merge branch 'master' of git://github.com/worklist/hifi into 19262
Conflicts:
	interface/src/Head.cpp
	interface/src/Util.cpp
	interface/src/main.cpp
	libraries/avatars/src/Orientation.cpp
2013-04-18 12:38:35 +02:00
Philip Rosedale
a1d51f8db8 Merge remote-tracking branch 'upstream/master' 2013-04-18 00:20:47 -07:00