Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-23 16:29:14 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
2237 commits 25 branches 0 tags 1.1 GiB
Commit graph

1019 commits

Author SHA1 Message Date
Stephen Birarda
ccbbf31beb fix for extraneous typedefs and reference to AgentListIterator as friend 2013-04-25 17:10:09 -07:00
Stephen Birarda
d2714e9321 resolve conflicts on merge with upstream master 2013-04-25 17:04:18 -07:00
Stephen Birarda
e6d278ea12 Merge remote-tracking branch 'upstream/master' into agentlist-array 2013-04-25 17:01:17 -07:00
Stephen Birarda
3df81cc92a resolve conflicts on merge with upstream master 2013-04-25 16:41:35 -07:00
Stephen Birarda
cdb8b1b144 Merge remote-tracking branch 'upstream/master' into agentlist-array 2013-04-25 16:40:20 -07:00
Jeffrey Ventrella
7a94310d4e Merge remote-tracking branch 'upstream/master' 2013-04-25 16:32:27 -07:00
Jeffrey Ventrella
86e72a90d4 working on camera view shifting from first person to third person 2013-04-25 16:31:42 -07:00
Stephen Birarda
edc908b1cd AgentList type squishes across project 2013-04-25 16:25:49 -07:00
Stephen Birarda
7e0dab6224 spacing fixes in Avatar class 2013-04-25 16:18:17 -07:00
Stephen Birarda
da6bbacc8e type squish in main.cpp 2013-04-25 16:12:43 -07:00
Stephen Birarda
2bda700753 put iterator statements on one line in main.cpp 2013-04-25 16:12:22 -07:00
Stephen Birarda
215efe3b78 bunch of const changes for glm::vec3 in Avatar and Orientation 2013-04-25 16:10:55 -07:00
Stephen Birarda
8370fd2d19 spacing fixes in Avatar class 2013-04-25 16:04:08 -07:00
Stephen Birarda
be37237b84 fix indent in Avatar class 2013-04-25 15:58:42 -07:00
Stephen Birarda
114f949a6e spacing cleanup in Avatar class 2013-04-25 15:58:03 -07:00
Stephen Birarda
625a963918 prefer -> notation to (*TYPE) for AgentList iterator 2013-04-25 15:49:25 -07:00
Andrzej Kapolka
d5da35e91a Merge branch 'master' of https://github.com/worklist/hifi 2013-04-25 15:41:57 -07:00
Andrzej Kapolka
620e1c728c Removed kludge; it turned out lighting was enabled. 2013-04-25 15:41:09 -07:00
Stephen Birarda
dac660efda resolve conflicts after merge with upstream master 2013-04-25 15:30:57 -07:00
Stephen Birarda
5ddd9a9f4f Merge remote-tracking branch 'upstream/master' into agentlist-array 2013-04-25 15:27:40 -07:00
Andrzej Kapolka
d041072d40 Delete support (though the one on my numeric keypad doesn't work?), 
sending key states.
 2013-04-25 15:26:05 -07:00
Stephen Birarda
2850d74a84 add typedefs for stl iterator implementation 2013-04-25 14:48:07 -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
Andrzej Kapolka
675d06e4b9 More chat bits; basic functionality now working. 2013-04-25 14:03:31 -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
Stephen Birarda
836d286b75 initial transition from vector to multi-dimensional array in AgentList 2013-04-25 13:11:13 -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
Jeffrey Ventrella
68b3f54f5c tiny change 2013-04-25 10:44:01 -07:00
Philip Rosedale
9e62728c33 Changed velocity to be dvec3 2013-04-25 10:18:30 -07:00
Philip Rosedale
b9fb888073 Small speed/cleanup to thrust setting 2013-04-25 10:02:14 -07:00
Philip Rosedale
ba55175870 Gravity is ON near origin, off in space, and a gravity field can be created with getGravity() 2013-04-25 09:50:35 -07:00
Andrzej Kapolka
10a9f31d65 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-25 09:41:13 -07:00
ZappoMan
2c48139ff3 some cleanup 2013-04-25 00:02:51 -07:00
ZappoMan
0bec7156aa Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-24 23:50:57 -07:00
ZappoMan
9bc2f667b6 adding some temporary debugging code 2013-04-24 23:46:47 -07:00
ZappoMan
732b4879e0 added a test routine for testing insertIntoSortedArrays() 2013-04-24 23:20:20 -07:00
Andrzej Kapolka
1a79bbd80d Fleshing out the chat entry widget. 2013-04-24 18:30:46 -07:00
Philip Rosedale
fd329cd1bb Merge remote-tracking branch 'upstream/master' 2013-04-24 17:56:57 -07:00
Jeffrey Ventrella
80576120ee Merge remote-tracking branch 'upstream/master' 2013-04-24 17:54:31 -07:00
Jeffrey Ventrella
72e6e18992 fixed avatar collisions 2013-04-24 17:54:09 -07:00
Philip Rosedale
fe1357aba2 Merge remote-tracking branch 'upstream/master' 2013-04-24 17:45:58 -07:00
Philip Rosedale
2a3d06f6de Fixed warning in starfield code 2013-04-24 17:45:26 -07:00
Andrzej Kapolka
9d4fded901 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/main.cpp
 2013-04-24 17:11:37 -07:00
Andrzej Kapolka
f538e2bdbc Added key state to avatar data, started on chat entry field. 2013-04-24 17:06:55 -07:00
birarda
d4e64462dd Merge pull request #141 from PhilipRosedale/master 
Wider log, log screen in menu
 2013-04-24 17:05:12 -07:00
Jeffrey Ventrella
2163976f06 adding the files 2013-04-24 17:01:59 -07:00
Philip Rosedale
0e4da5198d Merge remote-tracking branch 'upstream/master' 2013-04-24 16:59:18 -07:00
Jeffrey Ventrella
ff1334d8b6 Merge remote-tracking branch 'upstream/master' 2013-04-24 16:58:54 -07:00
Philip Rosedale
bc65126004 Wider log window, log panel on by default, menu->tools->log to control. 2013-04-24 16:58:52 -07:00
Jeffrey Ventrella
e54fd0dd7d renamed "Head" to "Avatar" and did a bunch a cleanups, including removing the three-lined comments 2013-04-24 16:54:07 -07:00
Philip Rosedale
6c986a1049 Merge pull request #127 from tschw/19188 
19188
 2013-04-24 16:53:04 -07:00
birarda
b8054790b0 Merge pull request #138 from Ventrella/master 
major changes to hand holding logic (ordering mostly)
 2013-04-24 16:45:33 -07:00
Jeffrey Ventrella
a9ff483d3d fix 2013-04-24 15:35:11 -07:00
Andrzej Kapolka
6c435569c2 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-24 15:31:10 -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
Jeffrey Ventrella
e93430d553 fix 2013-04-24 14:56:29 -07:00
Jeffrey Ventrella
bfc4befb9b Merge remote-tracking branch 'upstream/master' 2013-04-24 14:55:25 -07:00
Jeffrey Ventrella
86086ef20c just did a fairly major re-ordering of avatar interaction logic in Head.cpp 2013-04-24 14:52:04 -07:00
Stephen Birarda
9c3ebf9f64 only set hand state for mouse press for me 2013-04-24 14:11:07 -07:00
Philip Rosedale
179bdc9fa2 Merge remote-tracking branch 'upstream/master' 2013-04-24 13:12:40 -07:00
Philip Rosedale
33f95c696b Fixes per code review 2013-04-24 13:12:08 -07:00
Stephen Birarda
cfbe8a719c fix getter for hand state in AvatarData 2013-04-24 12:39:25 -07:00
Philip Rosedale
055e62c165 Merge remote-tracking branch 'upstream/master' 2013-04-24 12:24:09 -07:00
Andrzej Kapolka
63a581dae4 Added normals to voxel geometry, enabling lighting. 2013-04-24 11:47:44 -07:00
Jeffrey Ventrella
4e7f1ee422 more cleanup of hand holding code 2013-04-24 11:39:43 -07:00
Philip Rosedale
78aa4fdf80 Simplified average loudness calculation, mouths and eyebrows of other people now move again! 2013-04-24 11:26:59 -07:00
Jeffrey Ventrella
eca6999c2c added behavior in Eve for alternating between grasping and ungrasping hand (tho unable to test transmission). Also, improved readability of hand grasping logic in Head.cpp 2013-04-24 11:02:23 -07:00
Philip Rosedale
50af1f68bf Merge remote-tracking branch 'upstream/master' 2013-04-24 08:46:27 -07:00
Jeffrey Ventrella
ee9ae3f220 improved avatar hand-holding logic 2013-04-24 08:13:15 -07:00
tosh
225188a6f9 Merge branch 'master' of git://github.com/worklist/hifi into 19188 2013-04-24 13:32:30 +02:00
Jeffrey Ventrella
8135a45ccf removed pinky orientation lines in avatar bones 2013-04-23 22:05:02 -07:00
Jeffrey Ventrella
54aac82e9c cleanup 2013-04-23 21:30:53 -07:00
Jeffrey Ventrella
61a17060c3 one more glitch... 2013-04-23 21:17:39 -07:00
Philip Rosedale
d65f577268 Merge remote-tracking branch 'upstream/master' 2013-04-23 21:12:24 -07:00
Jeffrey Ventrella
48da3f726e fixed bug - didn't change bodyPosition in eve or voxel 2013-04-23 21:07:40 -07:00
Philip Rosedale
a440570cb4 Merge remote-tracking branch 'upstream/master' 2013-04-23 21:00:53 -07:00
Jeffrey Ventrella
428cb89895 Merge remote-tracking branch 'upstream/master' 2013-04-23 20:44:50 -07:00
Jeffrey Ventrella
61d7a82fc6 made lots of changes in the logic of how my avatar encounters other avatars and detects hand state 2013-04-23 20:44:12 -07:00
Philip Rosedale
99a4d0f3dc Merge remote-tracking branch 'upstream/master' 2013-04-23 20:11:35 -07:00
Jeffrey Ventrella
eb631e2ef6 renamed "bodyPosition" to "position". (This corresponds to the position of the avatar on the ground, where y=0). I will next add a new "getBodyPosition" which returns the avatar's center of gravity - is useful for certain purposes, such as setting collision volumes, etc. 2013-04-23 14:05:23 -07:00
Jeffrey Ventrella
a73ea8c255 some preparation for adding hand state to avatar interactions 2013-04-23 13:48:34 -07:00
Stephen Birarda
42ba5a51d4 Merge remote-tracking branch 'upstream/master' 2013-04-23 13:38:59 -07:00
Stephen Birarda
7ae320d7e1 intial version of eve that says WALL-E every so often 2013-04-23 13:37:49 -07:00
Philip Rosedale
be7fb7bce5 Merge remote-tracking branch 'upstream/master' 2013-04-23 13:32:15 -07:00
Philip Rosedale
d550b09399 Added 'gyro look' option to have gyro drive your render yaw, added render menu. 2013-04-23 13:31:05 -07:00
Jeffrey Ventrella
e19d4fd5f9 changes from Philip's push - I assume 2013-04-23 12:23:08 -07:00
Jeffrey Ventrella
a1e3149d6a Merge remote-tracking branch 'upstream/master' 2013-04-23 12:20:26 -07:00
Philip Rosedale
90c56e796b One... last.... const.... 2013-04-23 12:07:12 -07:00
Philip Rosedale
5556686875 Fixes from brad's review 2013-04-23 11:59:43 -07:00
Philip Rosedale
7aea9d1e61 Fixed :: prefix for local variables 2013-04-23 11:21:36 -07:00
Philip Rosedale
2ef45e8512 Avatar head rotation, audio loudness (for facial animation) and hand state (grabbing or not) now sent in broadcast data. 2013-04-23 11:15:11 -07:00
Jeffrey Ventrella
8e27a69e92 Merge remote-tracking branch 'upstream/master' 2013-04-23 11:13:24 -07:00
Jeffrey Ventrella
8df6a7e056 added collision code for avatar (not operational yet). and some cleanup. 2013-04-23 11:12:38 -07:00
Philip Rosedale
9760b7d410 First commit to re-enable gyros, removed various old head_mirror variables, now use 'lookingInMirror', etc. Local gyros now correctly drive own head. 2013-04-23 09:47:52 -07:00
tosh
723d49d78c Merge branch 'master' of git://github.com/worklist/hifi into 19188 2013-04-23 16:08:47 +02:00
Stephen Birarda
4956370d52 have parseData return the number of bytes consumed 2013-04-22 18:05:27 -07:00
Jeffrey Ventrella
1524bd55a8 Merge remote-tracking branch 'upstream/master' 2013-04-22 17:42:07 -07:00
Jeffrey Ventrella
602fd94af2 a few cleanups 2013-04-22 17:41:12 -07:00
birarda
2d8092eaf7 Merge pull request #106 from Ventrella/master 
Improved avatar rendering
 2013-04-22 17:33:42 -07:00
ZappoMan
978a41f6ca Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-22 17:22:24 -07:00
ZappoMan
4e0a3e3b58 switch to boxInFrustum() instead of pointInFrustum() for more accuracy 2013-04-22 17:21:47 -07:00
Jeffrey Ventrella
9a53832599 Merge remote-tracking branch 'upstream/master' 2013-04-22 16:33:30 -07:00
Jeffrey Ventrella
3dc03f44a1 improved rendering of avatar 2013-04-22 16:32:35 -07:00
Stephen Birarda
fb703171f2 make other heads the same color and same size 2013-04-22 16:30:45 -07:00
birarda
84adea86e3 Merge pull request #103 from birarda/master 
fix rendering of other agent types
 2013-04-22 16:05:32 -07:00
Stephen Birarda
ba4235c175 don't render agents that are not of type avatar 2013-04-22 16:04:46 -07:00
Jeffrey Ventrella
caead24462 Merge remote-tracking branch 'upstream/master' 2013-04-22 15:40:25 -07:00
Jeffrey Ventrella
ca2840f905 Cleaned up some const values in Head.h, implemented avatar gravity and ground collision, improved test sphere collision, added _usingBodySprings test to getHeadPosition, improved camera settings in main.cpp, cleaned up commented-out code in main.cpp 2013-04-22 15:39:31 -07:00
ZappoMan
1b52bb4e20 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 
Conflicts:
	voxel-server/CMakeLists.txt
 2013-04-22 14:48:24 -07:00
ZappoMan
9b34427570 Added camera data to AvatarData class, and include it in interface 2013-04-22 14:12:08 -07:00
Jeffrey Ventrella
1b91a8e653 Merge remote-tracking branch 'upstream/master' 2013-04-22 14:05:29 -07:00
Stephen Birarda
c00b5f5e8d fix missed reference to AGENT_TYPE_INTERFACE 2013-04-22 14:05:16 -07:00
Jeffrey Ventrella
60f0e6581d improved test sphere collision algorithm 2013-04-22 14:04:36 -07:00
ZappoMan
487b74f073 Merge pull request #100 from birarda/eve 
intial revision of eve the NPC
 2013-04-22 13:58:54 -07:00
Jeffrey Ventrella
f8884d420c Merge pull request #99 from Ventrella/master 
fixed remote avatar hand position
 2013-04-22 13:44:02 -07:00
birarda
79a178997d Merge pull request #98 from PhilipRosedale/master 
Added stats to menu bar for both avatars and other servers
 2013-04-22 13:23:09 -07:00
Philip Rosedale
7d52af6fd4 Fixed per stephen 2013-04-22 13:20:12 -07:00
Jeffrey Ventrella
b7d6ce9747 fixed avatar hand position by making avatars simulate all the time,and also fixing logic of _isMine 2013-04-22 13:15:46 -07:00
Philip Rosedale
736eb335a9 Added stats at upper right for servers and avatars separately. 2013-04-22 13:12:17 -07:00
Stephen Birarda
c68ec079eb rename AGENT_TYPE_INTERFACE to AGENT_TYPE_AVATAR, more stubbing for eve 2013-04-22 11:54:24 -07:00
Jeffrey Ventrella
7b60ddf057 Merge remote-tracking branch 'upstream/master' 2013-04-22 10:31:51 -07:00
Jeffrey Ventrella
2e402c3b17 added - and then removed - some orientation-related tests 2013-04-22 10:29:14 -07:00
ZappoMan
358efb472d Clean up AABox to coding standard, made several methods const 
- Cleaned up AABox to be consistent with the coding standard
- converted some methods to const and fixed up callers
 2013-04-21 22:46:13 -07:00
ZappoMan
3dc818d31e Changed false colorization to use point in frustum for now, since that works 2013-04-21 15:22:36 -07:00
ZappoMan
7a632115e4 fixed crash when no avatar mixer is present and display stats is enabled 2013-04-21 12:18:42 -07:00
ZappoMan
34b401d13f changed render_view_frustum() to match coding standard, added menu items, cleanup 
- split render_view_frustum() into two parts: loadViewFrustum() and renderViewFrustum()
- cleaned up debug menu items to match actual false color behaviors
- coding standard cleanup
 2013-04-21 12:01:54 -07:00
ZappoMan
67910a2c29 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-19 20:08:47 -07:00
ZappoMan
8c4536199f added menu items for false color operations 2013-04-19 20:02:14 -07:00
ZappoMan
75a79a09ed fixed LOD bug, added support for false colors 
- fixed LOD bug related to mismatch with getting node position
- changed VoxelSystem to honor new VoxelNode color support for false color
- added some implementations of tree recursion that do things like false
  color the tree for distance, randomly, or resetting to true color, or
  stomping on the local version of the true color to debug packet sending
 2013-04-19 19:58:37 -07:00
Jeffrey Ventrella
08105c3898 I did a major cleanup of the Head class, including putting all the "head"-related members into a single structure. We may consider making a separate class just to handle the head. 2013-04-19 17:09:28 -07:00
Jeffrey Ventrella
06f8990d42 removed avatar structure from Head class (leftover from the start of the prototyping phase) 2013-04-19 14:52:06 -07:00
Jeffrey Ventrella
9a93ab7d7c cleaned up logic for body springs mode and moving hand mode 2013-04-19 14:34:01 -07:00
Jeffrey Ventrella
d962230556 fixed sneaky array-out-of-bounds error in avatar bones and cleaned up some of the code for testing hand shake target positions 2013-04-19 12:44:09 -07:00
Jeffrey Ventrella
623c998439 removed init values in HandMovement structure 2013-04-18 21:31:20 -07:00
Jeffrey Ventrella
9dd423f544 removed updateAvatarHand function 2013-04-18 19:30:27 -07:00
Jeffrey Ventrella
ed5f117b04 Merge remote-tracking branch 'upstream/master' 2013-04-18 19:26:29 -07:00
Jeffrey Ventrella
298bc7eee9 added more robust avatar hand movement algorithm in main.cpp 2013-04-18 19:24:57 -07:00
tosh
bc9279917d Merge branch 'master' of git://github.com/worklist/hifi into 19188 
Conflicts:
	interface/src/starfield/renderer/Renderer.h
 2013-04-19 03:09:53 +02:00
tosh
715534154e numerous starfield fixes 2013-04-19 02:46:34 +02:00
Stephen Birarda
daac10511e output avatar mixer stats below the voxel stats 2013-04-18 16:58:08 -07:00
Stephen Birarda
d0e3a96485 Merge remote-tracking branch 'upstream/master' into mixer-stats 2013-04-18 15:33:57 -07:00
Stephen Birarda
44cb57afad put back brad's voxel stats, he loves them too much 2013-04-18 15:33:17 -07:00
Stephen Birarda
588fc67cb9 add SimpleMovingAverage to each Agent, collect bytes received stats 2013-04-18 15:02:26 -07:00
ZappoMan
987553974a Merge pull request #86 from Ventrella/master 
reversed left-right strafe, commented-out updateAvatarHand
 2013-04-18 15:01:48 -07:00
Jeffrey Ventrella
2b5d23de5d Merge remote-tracking branch 'upstream/master' 2013-04-18 14:54:08 -07:00
Philip Rosedale
54cef39f51 Fixed problem with avatars rendering at 2X their location 2013-04-18 14:48:00 -07:00
Stephen Birarda
b9a1faf284 add a new SimpleMovingAverage class, replaces CounterStats 2013-04-18 14:46:39 -07:00
Jeffrey Ventrella
9ce1683c50 reversed strafe left right, and commented-out updateAvatarHand 2013-04-18 14:45:54 -07:00
Jeffrey Ventrella
449e05fd2a Merge remote-tracking branch 'upstream/master' 2013-04-18 14:13:27 -07:00
Jeffrey Ventrella
47ee938530 reversed x value in hand movement 2013-04-18 14:12:45 -07:00
Philip Rosedale
5443d80c6f Removed negation of front vector which was reversing yaw in avatar skeleton. 2013-04-18 14:00:48 -07:00
Philip Rosedale
daac59d64e Merge remote-tracking branch 'upstream/master' 2013-04-18 13:36:43 -07:00
Philip Rosedale
d9099b5f5a removed 2 unneeded debug lines 2013-04-18 13:34:37 -07:00
Jeffrey Ventrella
de6f33efa6 added "_" to all of Philip's old private members and tidied up the formatting in Head.h some 2013-04-18 13:16:36 -07:00
tosh
1e58f6fd40 fixes upside down aspect ratio 2013-04-18 20:02:24 +02:00
ZappoMan
74c5916519 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 
Conflicts:
	interface/src/main.cpp
 2013-04-18 10:57:41 -07:00
ZappoMan
894715598c fixed a comment 2013-04-18 08:49:07 -07:00
Philip Rosedale
a834c52b40 Quick attpemt to fix logging code 2013-04-18 07:48:57 -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
ZappoMan
f0d891b641 Merge pull request #80 from PhilipRosedale/master 
Stars back on
 2013-04-18 01:38:42 -07:00
ZappoMan
532dc285e7 Changed render_view_frustum() to handle broken camera yaw 
- I discovered that the Camera class has a Yaw that is actually
  180deg off of true yaw. So when the avatar is facing at a yaw
  of 0deg, we were setting the camera to 180. This was causing
  the direction vectors to be rotated from where we expected them
  to be, and as a result the frustum was wrong
- I did not fix the camera and the calls to glRotate() since I
 don't yet understan how these work. BUT. I did fix the frustum
 code to fix up this yaw before calculating the vectors
 2013-04-18 01:16:54 -07:00
Philip Rosedale
a1d51f8db8 Merge remote-tracking branch 'upstream/master' 2013-04-18 00:20:47 -07:00
Philip Rosedale
ad30abdf20 sphere on 2013-04-18 00:20:22 -07:00
Philip Rosedale
1dd2fcf37d Merge pull request #81 from ZappoMan/view_frustum_work 
Updated Orientation class to use Philip's technique.
 2013-04-18 00:18:19 -07:00
ZappoMan
309eb08490 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-17 23:53:47 -07:00
Philip Rosedale
23dc5f435b Merge remote-tracking branch 'upstream/master' 2013-04-17 23:45:36 -07:00
ZappoMan
44e6fcc5e9 remove pitch from camera since it still breaks Orientation 2013-04-17 23:42:39 -07:00
ZappoMan
8b9e252246 Updated Orientation class to use Philip's technique. 
- Changed Orientation class to use Philip's technique for determining vectors
- updated main.cpp to take command line option to run Orientation tests
- tweaked eulerToOrthonormals() to return right vector instead of left vector
 2013-04-17 23:21:12 -07:00
Jeffrey Ventrella
bca2460395 Merge remote-tracking branch 'upstream/master' 2013-04-17 23:20:08 -07:00
Jeffrey Ventrella
bd0eb9f69c renamed Yaw Pitch Roll to _headYaw, _headPitch, _headRoll, in Head class. And also added a "bigSphere avatar collision test", also added a bone radius (for collision detection) 2013-04-17 23:18:36 -07:00
Philip Rosedale
f70429e575 Added a translucent ground plane, and made a few more grid lines. Easier to see when 'standing' on. 2013-04-17 22:47:58 -07:00
Philip Rosedale
bb2cc54c97 Stars turned back on by default - lemme know if anyone sees problems. 2013-04-17 22:23:19 -07:00
Philip Rosedale
b7346474d0 Merge pull request #71 from tschw/19188 
19188
 2013-04-17 22:15:39 -07:00
ZappoMan
e51031c464 Merge pull request #78 from ZappoMan/view_frustum_work 
Added more tests for Orientation
 2013-04-17 21:14:37 -07:00
Philip Rosedale
d200936615 Added eulerToOrthonormals function for Brad in Util.cpp, sample execution at start of main. 2013-04-17 21:10:31 -07:00
Jeffrey Ventrella
46c95ea4af did some code cleanup in Head class and added some _isMine checks to differentiate between my av and others 2013-04-17 18:28:26 -07:00
ZappoMan
a64fca17c5 Added more tests for Orientation 2013-04-17 18:25:12 -07:00
Jeffrey Ventrella
6b8fe0cba1 Merge remote-tracking branch 'upstream/master' 2013-04-17 18:11:38 -07:00
Jeffrey Ventrella
4e12f26467 added _isMine check for my _bodyYaw update 2013-04-17 18:10:32 -07:00
Stephen Birarda
3538e2cf5b fix the number of bytes used for head broadcast 2013-04-17 17:59:59 -07:00
Jeffrey Ventrella
aba20c6afd a few debugging changes 2013-04-17 17:48:08 -07:00
Stephen Birarda
484ab53764 fix the flipped sign for agentHead translate 2013-04-17 17:04:29 -07:00
Jeffrey Ventrella
d7f37e5972 Merge remote-tracking branch 'upstream/master' 2013-04-17 17:04:24 -07:00
Philip Rosedale
db95b0d726 Merge remote-tracking branch 'upstream/master' 2013-04-17 17:00:10 -07:00
birarda
8d4061dd72 Merge pull request #72 from birarda/master 
a better interim solution for bytes per avatar
 2013-04-17 16:58:49 -07:00
Stephen Birarda
e75add411c use a constant number of BYTES_PER_AVATAR as an interim solution 2013-04-17 16:58:16 -07:00
Jeffrey Ventrella
ecb5047e7c removed initializeAvatar() method in Head class (deprecated). and also un-negated the pos in the rendering of other avatars (same fix as Philip just made) 2013-04-17 16:58:04 -07:00
Philip Rosedale
6b03622e29 Fixed bug having other people showing up at negative of their transmitted position. 2013-04-17 16:49:39 -07:00
Jeffrey Ventrella
5aeb307be2 including Philips hand position transmission code 2013-04-17 15:36:40 -07:00
Jeffrey Ventrella
5595bb8cf6 Merge remote-tracking branch 'upstream/master' 2013-04-17 15:34:00 -07:00
Jeffrey Ventrella
0306b63af4 added more cleanup and preparation for switching over to quaternions 2013-04-17 15:32:16 -07:00
tosh
3175ba7d45 Merge branch 'master' of git://github.com/worklist/hifi into 19188 2013-04-18 00:18:38 +02:00
Philip Rosedale
952cb2f2ae Added head _isMine variable, added hand position transmission! 2013-04-17 15:14:30 -07:00
tosh
38d229ab67 reiterates starfield: 
o allows UrlReader to cache the downloaded content in a local (updating it
    automatically when the server indicates a newer time stamp)

  o retires the FieldOfView class

  o makes the stars move again

  o fixes bad deletion in UrlReader (delete instead of delete[])

  o allows UrlReader to advertise supported compression algorithms to the server
 2013-04-18 00:13:41 +02:00
Philip Rosedale
5729ecb3f4 Merge remote-tracking branch 'upstream/master' 2013-04-17 14:23:43 -07:00
Stephen Birarda
4b1ce1158f fix number of bytes for avatar processBulkAgentData 2013-04-17 13:15:44 -07:00
Jeffrey Ventrella
a44ff94f85 Merge remote-tracking branch 'upstream/master' 2013-04-17 12:50:41 -07:00
Jeffrey Ventrella
3856a70b7e added "_" to several members in Head class, and cleaned up some code formatting (housecleaning :) 2013-04-17 12:48:47 -07:00
Jeffrey Ventrella
4f0ca2f33e added quaternions to avatar body and bone structure (but not using them yet) 2013-04-17 12:31:03 -07:00
ZappoMan
eca7863cd9 Merge pull request #64 from birarda/master 
fix reference to resources directory via switchToResourcesParentIfRequired
 2013-04-17 12:04:25 -07:00
tosh
ebc6a25574 Merge branch 'master' of git://github.com/worklist/hifi into 19188 2013-04-17 20:57:39 +02:00
Stephen Birarda
e9592c45c7 fix reference to resources directory on OS X 2013-04-17 11:56:32 -07:00
tosh
77832dbcb4 makes FieldOfView store the view matrix instead of its inverse 2013-04-17 20:53:24 +02:00
Jeffrey Ventrella
3cee28f0ef added back the av position 2013-04-17 11:23:47 -07:00
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
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
Philip Rosedale
2e928166ed Merge remote-tracking branch 'upstream/master' 2013-04-17 10:00:17 -07: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
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
Philip Rosedale
d046162eaf Merge remote-tracking branch 'upstream/master' 2013-04-16 20:32:32 -07:00
Philip Rosedale
39bb556cd3 Fix to add local variable underscores to head get/add body yaw functions. 2013-04-16 20:29:10 -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
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
Stephen Birarda
d0a83f3c0e correct the number of bytes per agent from avatar mixer 2013-04-16 18:09:27 -07:00
Philip Rosedale
1aac3eb0df Merge remote-tracking branch 'upstream/master' 2013-04-16 17:31: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
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
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
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
Philip Rosedale
f4f8a4e41b Merge remote-tracking branch 'upstream/master' 2013-04-16 13:26:49 -07:00
Stephen Birarda
f8ab33ccc7 add missing packet header for broadcast head data 2013-04-16 12:48:47 -07:00
Stephen Birarda
8129c2477a fix broken voxel server build, change some char* to unsigned char* 2013-04-16 12:35:49 -07:00
Stephen Birarda
53108b01ef resolve conflicts on merge with upstream master 2013-04-16 12:02:33 -07:00
Stephen Birarda
1dd21a450e Merge remote-tracking branch 'upstream/master' 2013-04-16 12:00:55 -07:00
Stephen Birarda
e71f21b7bf fix broken builds from last commit, pull new avatar data in VoxelAgentData 2013-04-16 11:59:03 -07:00
Stephen Birarda
5c091a51a6 change signature of parseData to use unsigned char*, include packet header always 2013-04-16 11:51:36 -07:00
stojce
6b59374921 Merge pull request #48 from stojce/19261 
Code Review for Job #19261
 2013-04-16 08:40:01 -07:00
stojce
75c63f53fc use safe version of sprintf 2013-04-16 17:38:34 +02:00
ZappoMan
a3fabaf300 Merge pull request #50 from tschw/19188 
19188
 2013-04-16 08:25:07 -07:00
ZappoMan
1408be00f5 Merge pull request #47 from PhilipRosedale/master 
Cleanup and partial re-enabling of head gyros
 2013-04-16 08:21:27 -07:00
Philip Rosedale
2179932f60 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-16 07:35:03 -07:00
Philip Rosedale
1cdeac0fec Merge pull request #49 from ZappoMan/view_frustum_work 
Latest view frustum work
 2013-04-16 07:24:36 -07:00
tosh
7c2cff824f renames AngleUtils -> AngleUtil for consistency with the rest of the files 2013-04-16 14:07:19 +02:00
tosh
ac55c610be tidies changeset 2013-04-16 14:06:03 +02:00
ZappoMan
246380b41e temp fix to setPitch() problem. Removed some debug printfs. Fixed menu flicker bug. 2013-04-16 00:55:44 -07:00
Philip Rosedale
d00001613f Renamed functions in head, added ability to change body yaw. 2013-04-15 21:06:45 -07:00
Philip Rosedale
5e5a7e0a0c Improved SerialInterface: Added gravity vector get function, closer to coding standards, better rendering of levels. 2013-04-15 20:52:18 -07:00
Philip Rosedale
b3e99513cb Merge branch 'master' of https://github.com/worklist/hifi 2013-04-15 18:37:59 -07:00
Philip Rosedale
cd3e414eda Removed unneeded variables in main.cpp for pitch,yaw. Renamed routines to make it more clear where gyros are being read. Re-enabled marker box being driven by head gyros. 2013-04-15 18:37:46 -07:00
Stephen Birarda
288a259ac1 more conflict resolutions for broken build after pull 2013-04-15 18:37:25 -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
e7fa540796 cleaning up of whacky currentCamera experiment 2013-04-15 18:30:33 -07:00
ZappoMan
faf57d9fa8 a little hackery when in view frustum mode so we can see the frustum without OpenGL clipping us 2013-04-15 18:11:23 -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
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
ZappoMan
2625ef014c latest View Frustum work 2013-04-15 17:57:48 -07:00
ZappoMan
c2c36e6cea Tweaks to Camera class 
- added lens attributes
- coding standard cleanup
 2013-04-15 17:56:52 -07:00
stojce
8da449041c small code formating fix 2013-04-16 02:26:11 +02:00
stojce
39df647dcb #19261 - Add startup time to the main window title, fit to screen 2013-04-16 02:24:38 +02:00
Jeffrey Ventrella
fc8c0498cf adjusted avatar height and camera up to compensate - improves navigation 2013-04-15 16:16:05 -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
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
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