Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-18 23:00:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
63689 commits 72 branches 59 tags 1.2 GiB
Commit graph

19698 commits

Author SHA1 Message Date
Philip Rosedale
824abca443 Removed field and Cloud classes 2013-04-26 11:57:04 -07:00
Stephen Birarda
948f9607f6 send head position as source position to mixer 2013-04-26 11:49:52 -07:00
Philip Rosedale
2e518f8dac Removed renderPitchRate, renderYawRate, startYaw from main.cpp, they are not doing anything. 2013-04-26 11:36:44 -07:00
Stephen Birarda
ded5da47ff correct the sign of the absolute head yaw sent to avatar mixer 2013-04-26 11:35:55 -07:00
Andrzej Kapolka
0932a8b382 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-26 11:31:15 -07:00
Stephen Birarda
7c855464e1 make the absolute head yaw getter const 2013-04-26 11:22:42 -07:00
Stephen Birarda
fbdcd57529 correct yaw sent to audio-mixer in Audio 2013-04-26 11:21:34 -07:00
Andrzej Kapolka
b9fdba2711 Rather than creating a thread to read datagrams, just set the socket to 
nonblocking mode and check it before simulating.  This addresses one aspect
of the lack of synchronization on AgentList, but there are other issues...
 2013-04-26 11:08:41 -07:00
Stephen Birarda
1884bfc17e some spacing cleanup in Audio class 2013-04-26 10:58:01 -07:00
Jeffrey Ventrella
fe2e180f16 merge with upstream master 2013-04-26 10:56:48 -07:00
Philip Rosedale
e304e0dfb3 Fixing spacing nits in balls class 2013-04-26 10:21:17 -07:00
Andrzej Kapolka
46041b2ed9 Style tweaks: preface privates with underscore, capitalize enum members. 2013-04-26 10:21:14 -07:00
Philip Rosedale
61578d1ddb Added balls class 2013-04-26 09:59:50 -07:00
Philip Rosedale
e4c2004a69 Added constant to turn OFF avatar BALLS testing 2013-04-26 09:34:10 -07:00
ZappoMan
91f6aaa96e testing of new searchForColoredNodes() 2013-04-26 09:23:48 -07:00
ZappoMan
17694b3f46 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 
Fixed conflict in interface/src/main.cpp
 2013-04-25 23:49:08 -07:00
ZappoMan
a176753379 added VoxelNodeBag 2013-04-25 23:47:12 -07:00
Jeffrey Ventrella
ce1ceb849f Added HandControl class and also Avatar Touch class 2013-04-25 23:32:04 -07:00
Philip Rosedale
cac9e33f8c Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/Avatar.cpp
	interface/src/Avatar.h
 2013-04-25 20:47:01 -07:00
tosh
95f2b4373d adjusts main.cpp (oscilloscope does not render when disabled and does no longer need an external check) 2013-04-26 05:09:00 +02:00
tosh
50eb9a2a54 Merge branch 'master' of git://github.com/worklist/hifi into 19165 2013-04-26 05:07:31 +02:00
Philip Rosedale
1a5f499b45 First commit with initial Balls class for avatar sphere cloud 2013-04-25 19:56:47 -07:00
tosh
41115fc0f1 reimplements oscilloscope and connects output channels 2013-04-26 04:25:58 +02:00
Andrzej Kapolka
c6661e8b8e Lowered the chat message height and put it in a variable. 2013-04-25 17:48:47 -07:00
Andrzej Kapolka
c6af08d883 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	avatar-mixer/src/main.cpp
 2013-04-25 17:40:55 -07:00
Andrzej Kapolka
1713bebb64 Added the basic key press/message composition display. 2013-04-25 17:36:47 -07:00
ZappoMan
899068e3a6 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-25 17:35:02 -07:00
ZappoMan
32da105d62 new testing/debug code for encodeTreeBitstream() 2013-04-25 17:33:43 -07:00
Stephen Birarda
09256d8c4e put back default for AVATAR_BONE_RIGHT_FOREARM 2013-04-25 17:15:48 -07:00
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
Jeffrey Ventrella
84ca2dcb32 added get avatar bone 2013-04-12 16:12:31 -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
d01d1164ca latest view frustum work 2013-04-12 13:36:44 -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
85bef98f4a Merge branch 'master' of https://github.com/worklist/hifi into voxel_lod_fixes 2013-04-11 18:42:12 -07:00
birarda
e638805bd7 Merge pull request #30 from PhilipRosedale/master 
Added startup timer
 2013-04-11 17:54:45 -07:00
Philip Rosedale
76e2ca301e Fixes stephen asked for - remove finger stuff 2013-04-11 17:53:57 -07:00
Philip Rosedale
27c032270c Resolved merge 2013-04-11 17:49:43 -07:00
Philip Rosedale
47dfb08ff2 Merge remote-tracking branch 'origin/startupTimer' 2013-04-11 17:46:20 -07:00
birarda
9ea6457c0c Merge pull request #28 from PhilipRosedale/master 
Trivial change for Stephen to teach me
 2013-04-11 17:41:19 -07:00
Jeffrey Ventrella
948ca6279c improved avatar handshake forces 2013-04-11 17:39:18 -07:00
Philip Rosedale
f1bf7d0eb5 trivial test, removed one unneeded variable 2013-04-11 17:35:32 -07:00
Jeffrey Ventrella
766fad8c2a Merge branch 'master' of https://github.com/worklist/hifi 2013-04-11 16:51:27 -07:00
Jeffrey Ventrella
1dc390bf3a working on avatar local ori motions 2013-04-11 16:51:08 -07:00
Stephen Birarda
7c3f5264b5 resolve conflicts on merge with upstream master 2013-04-11 16:48:40 -07:00
Stephen Birarda
a1d209dd70 manage one AgentList per process via singleton 2013-04-11 15:45:04 -07:00
Jeffrey Ventrella
bd09084031 cleaned up some Orientation formtting 2013-04-11 15:37:15 -07:00
Jeffrey Ventrella
661d5fdb3e Merge 
Merge branch 'master' of https://github.com/worklist/hifi
 2013-04-11 15:32:44 -07:00
Jeffrey Ventrella
556f11a0c0 added test 'other' avatar for proxemixs testing 2013-04-11 15:32:35 -07:00
ZappoMan
f376b954ca Merge branch 'master' of https://github.com/worklist/hifi into voxel_lod_fixes 2013-04-11 14:58:14 -07:00
Stephen Birarda
606c91bb47 remove the Vector3D class, not in use 2013-04-11 14:56:10 -07:00
ZappoMan
a68ae64a17 Merge branch 'master' of https://github.com/worklist/hifi into voxel_lod_fixes 2013-04-11 13:07:52 -07:00
Jeffrey Ventrella
6f0881f40d reversed left-right strafe 2013-04-11 13:06:47 -07:00
ZappoMan
e9ef765021 set default frustum to cameraFrustum not head frustum 2013-04-11 12:51:43 -07:00
Stephen Birarda
78fdccccad rename avatar mixer packet header, match in interface network receive 2013-04-11 11:18:54 -07:00
ZappoMan
002d35932e Merge pull request #21 from birarda/19170B 
Leo's Avatar Mixer + birarda's AgentData updates
 2013-04-11 10:43:02 -07:00
ZappoMan
0fff73e225 fixed plainting with new head implementation 2013-04-11 01:36:52 -07:00
ZappoMan
24862ca535 fixing up render view frustum, now it's working 2013-04-11 01:02:04 -07:00
Philip Rosedale
a0938cddea Merge remote-tracking branch 'origin' into startupTimer 2013-04-11 00:11:52 -07:00
Philip Rosedale
407da2aea8 Added a startup timer 2013-04-11 00:11:31 -07:00
Jeffrey Ventrella
cd8c760959 cleaned up some code 2013-04-11 00:10:52 -07:00
Philip Rosedale
81c4186179 pull (Jeffrey) 
Merge branch 'master' of github.com:worklist/hifi
 2013-04-10 21:55:47 -07:00
Jeffrey Ventrella
dbbe7500ac removed negative z hack in avatar. Avatar getting less hacky 2013-04-10 21:52:18 -07:00
Jeffrey Ventrella
6b4486c8c9 removed Vector3D class and fixed bug in avatar springs 2013-04-10 21:34:54 -07:00
ZappoMan
712b14c364 hacking on frustum for camera 2013-04-10 21:27:29 -07:00
ZappoMan
0f17c148f4 adding camera vs head for frustum view, not working yet 2013-04-10 21:21:13 -07:00
Jeffrey Ventrella
0564aa1a1b Hi! 
Merge branch 'master' of https://github.com/worklist/hifi
 2013-04-10 21:12:20 -07:00
Jeffrey Ventrella
f294cc8782 working on avatar orientation issues 2013-04-10 21:12:15 -07:00
Philip Rosedale
e0a704935d made display a bit cleaner 2013-04-10 19:08:22 -07:00
Philip Rosedale
5ea6a9a696 Add little balls to the end of the world coordinate axis markers when shown 2013-04-10 18:57:09 -07:00
Philip Rosedale
834821d005 Removed the lattice object 2013-04-10 18:25:54 -07:00
Philip Rosedale
34e5b670a2 Tweaked location and color of agents display for menu, removed audio start playback log 2013-04-10 18:01:18 -07:00
Philip Rosedale
859903274d Tweaks to menu to have right position under Mac, always on, slightly smaller font 2013-04-10 17:48:09 -07:00
Philip Rosedale
8b54b528c3 Fixed Menu to hit very top of screen on Mac 2013-04-10 17:35:53 -07:00
Philip Rosedale
6a5f1ac73e Merge remote-tracking branch 'origin/master' 2013-04-10 17:00:30 -07:00
Philip Rosedale
8d5ee616ac Added a debug menu option 2013-04-10 16:58:53 -07:00
Stephen Birarda
56f4484720 Merge branch 'master' of github.com:worklist/hifi 2013-04-10 16:57:34 -07:00
Stephen Birarda
6270659cdc inline declaration and initialization for menu 2013-04-10 16:56:15 -07:00
Jeffrey Ventrella
8429db73fa Hi there! 
Merge branch 'master' of https://github.com/worklist/hifi
 2013-04-10 16:52:55 -07:00
Jeffrey Ventrella
020c21d1d6 removed Vector3D class and fixed bug in avatar springs 2013-04-10 16:52:48 -07:00
Stephen Birarda
19b9a0f5f5 include cstring in MenuColumn for strlen and strcpy 2013-04-10 16:18:26 -07:00
Stephen Birarda
189bfdfb36 add header comments to Vincent's menu files 2013-04-10 16:16:36 -07:00
Stephen Birarda
6665e62341 include cstring for strlen and strcpy 2013-04-10 16:13:27 -07:00
Stephen Birarda
27ab895381 have MenuColumn constructor take const char* 2013-04-10 16:10:50 -07:00
Stephen Birarda
b152d43f77 refactor menu callbacks and row/column adding 2013-04-10 16:07:46 -07:00
birarda
88c2e9510d Merge pull request #22 from dominiquevincent/19171 
Code Review for Job #19171
 2013-04-10 15:49:23 -07:00
vincent
ebc5874441 #19171 Missing Code Review changes - part 2 2013-04-11 00:47:53 +02:00
Stephen Birarda
7731ae886a remove some more MARKER_CAPTURE code 2013-04-10 15:30:33 -07:00
Stephen Birarda
010c7e028d switch from strchr to memchr for broadcastToAgents 2013-04-10 15:30:21 -07:00
Jeffrey Ventrella
a2a7640bd2 merge 
Merge branch 'master' of https://github.com/worklist/hifi
 2013-04-10 15:27:10 -07:00
Jeffrey Ventrella
3871c220b2 improved hand movement - now transformed to av rotation 2013-04-10 15:27:04 -07:00
vincent
b43475a34e #19171 Missing Code Review changes 2013-04-11 00:23:41 +02:00
Stephen Birarda
c378241afb NULL terminate the broadcastReceivers char* 2013-04-10 15:20:35 -07:00
vincent
cd1aa99dfa #19171 merge with master 2013-04-11 00:20:05 +02:00
Stephen Birarda
9a4f73e3bd fix undeclared identifier myHead 2013-04-10 15:14:42 -07:00
Stephen Birarda
666517c50e Merge remote-tracking branch 'upstream/master' into 19170B 2013-04-10 15:14:12 -07:00
vincent
4dbff46234 #19171 Code Review changes 2013-04-11 00:13:40 +02:00
ZappoMan
5d1f11e413 fixed bug in frustrum direction, added viewing offset mode 2013-04-10 15:02:31 -07:00
Jeffrey Ventrella
a523a24c23 fixed hand motion stuff 2013-04-10 15:00:28 -07:00
Stephen Birarda
acc97282c9 bracket styling changes, removed commented code 2013-04-10 14:35:45 -07:00
Jeffrey Ventrella
797cec4513 hello! 
Merge branch 'master' of https://github.com/worklist/hifi
 2013-04-10 14:29:14 -07:00
Jeffrey Ventrella
7b4d0b5598 removed bone spam 2013-04-10 14:29:08 -07:00
vincent
eb646ade84 #19171 split of menu.cpp in menuColumn.cpp and menuRow.cpp 2013-04-10 22:39:01 +02:00
ZappoMan
4b7b5437ac some cleanup of view frustum debugging code 2013-04-10 13:26:21 -07:00
ZappoMan
7cd70b1f47 use Jeffery's code for view frustum debugging 2013-04-10 13:12:47 -07:00
Jeffrey Ventrella
228f76c789 Thingy! 
Merge branch 'master' of https://github.com/worklist/hifi
 2013-04-10 12:54:57 -07:00
Jeffrey Ventrella
be5044c560 flipped y direction of up-down avatar navigation 2013-04-10 12:54:52 -07:00
Philip Rosedale
d57a4428d9 deleted unused stuff that caused conflict with myAvatar change 2013-04-10 12:47:40 -07:00
Philip Rosedale
53df8a718a Merge remote-tracking branch 'origin/master' 2013-04-10 12:45:35 -07:00
Philip Rosedale
8010129774 Few more bits of cleanup and variable renaming, turned voxel rendering back on by default 2013-04-10 12:43:26 -07:00
Jeffrey Ventrella
87c351ce4f changed 'myHead' to 'myAvatar' in main.cpp, and a few local variables acordingly 2013-04-10 12:37:34 -07:00
Stephen Birarda
fcee05e9f0 handle pinging of unknown agents in AgentList thread 2013-04-10 12:37:14 -07:00
vincent
6a5c51bc69 #19171 Add a simple openGL menu that will work x-platform 2013-04-10 21:31:29 +02:00
Jeffrey Ventrella
eee57a9c0c fixed merge conflict 2013-04-10 12:21:40 -07:00
Philip Rosedale
f26f9546b7 Merge remote-tracking branch 'origin' 2013-04-10 12:20:18 -07:00
Philip Rosedale
480eededfd Another fix to starfield warning. 2013-04-10 12:19:55 -07:00
Philip Rosedale
57724cb569 Fixing some compiler warnings in starfield 2013-04-10 12:19:05 -07:00
ZappoMan
76937720bd Merge branch 'master' of https://github.com/worklist/hifi 2013-04-10 12:13:12 -07:00
Jeffrey Ventrella
089271f615 whatever you say, git. 
Merge branch 'master' of https://github.com/worklist/hifi
 2013-04-10 12:13:03 -07:00
Jeffrey Ventrella
ab8140e0ef fixed a bug in avatar head lookat direction 2013-04-10 12:12:57 -07:00
ZappoMan
28a41132a4 latest work on render_view_frustum 2013-04-10 12:12:52 -07:00
Stephen Birarda
de358d4bf6 fix warnings produced by starfield additions 2013-04-10 12:10:03 -07:00
Stephen Birarda
ec520752f1 Merge remote-tracking branch 'upstream/master' into 19170B 2013-04-10 12:07:35 -07:00
Stephen Birarda
cf1f087b38 add method to parse bulk agent data from a mixer 2013-04-10 11:57:24 -07:00
birarda
84456ac9af Merge pull request #20 from dominiquevincent/19197 
Code Review for Job #19197
 2013-04-10 11:49:59 -07:00
vincent
1e2e505301 Another merge and fix ... 2013-04-10 20:41:46 +02:00
Stephen Birarda
98db359db3 Merge branch 'master' of github.com:worklist/hifi into 19170B 2013-04-10 09:58:46 -07:00
Stephen Birarda
861108b12b Merge branch 'master' of github.com:worklist/hifi 2013-04-10 09:44:59 -07:00
ZappoMan
597f35db3d moved vector math helpers to Utils.cpp/h 2013-04-10 09:39:43 -07:00
Stephen Birarda
9ce03eb27a explicit initialization of audioSocket to NULL in AudioData constructor 2013-04-10 09:27:14 -07:00
ZappoMan
fc122f23d2 added first cut at view frustum debuging code 2013-04-10 01:32:01 -07:00
Jeffrey Ventrella
fac0c361f4 Yada Yada Yada Merge branch 'master' of https://github.com/worklist/hifi 2013-04-10 01:03:42 -07:00
Jeffrey Ventrella
8f969f9ca9 adding ground plane grid (again???) 2013-04-10 01:03:35 -07:00
ZappoMan
e19b53a344 added key interface to toggle voxels 2013-04-10 00:46:04 -07:00
Philip Rosedale
e910bece1d temp commented groundPlaneGrid till file is fixed 2013-04-10 00:30:24 -07:00
Philip Rosedale
7edd93fd2c Merge remote-tracking branch 'origin' 2013-04-10 00:25:20 -07:00
Philip Rosedale
ef785ba7aa Improved comments at start of main.cpp, dropped unused octal.h,.cpp files, deleted many unused system variables and functions. 2013-04-10 00:25:03 -07:00
vincent
c60cfe28ad Code review changes - missing adjustedNear change 2013-04-10 08:57:09 +02:00
vincent
bb380e841e Code review changes 2013-04-10 08:28:26 +02:00
Jeffrey Ventrella
1b833fb4a9 added grid plane to aid in testing avatar navigation 2013-04-09 21:14:24 -07:00
Jeffrey Ventrella
81b311f753 added a method to ask the avatar for it's head lookat vector 2013-04-09 18:41:01 -07:00
Stephen Birarda
4f576ba86f some spacing issues, conversions from const char to char * 2013-04-09 17:33:53 -07:00
Philip Rosedale
5a98ebfff2 Merge remote-tracking branch 'origin' 2013-04-09 17:13:01 -07:00
Philip Rosedale
760aafef8e Changed to render a small box of a fixed pixel width at screen center, useful for testing LOD Changes. 2013-04-09 17:12:43 -07:00
Stephen Birarda
9f10be749e Merge remote-tracking branch 'upstream/master' into 19170B 2013-04-09 17:04:20 -07:00
Stephen Birarda
ae7f3e71d8 broadcast to VS and avatar mixer on position change 2013-04-09 16:56:19 -07:00
Jeffrey Ventrella
3dae70e665 removed glm::dvec3 and replaced with glm::vec3 in most of avatar code, except for velocity 2013-04-09 15:23:59 -07:00
Jeffrey Ventrella
09af8d153f added camera modes and also set initial avatar yaw to 90 2013-04-09 15:05:37 -07:00
Leonardo Murillo
f07714ce5c Debugging 2013-04-09 15:51:08 -06:00
Jeffrey Ventrella
7d42b93489 condensed avatar bone line code 2013-04-09 14:45:19 -07:00
Jeffrey Ventrella
d05cf13870 Ya Ya Too Cool Too Cool 
dsfdsf

Merge branch 'master' of https://github.com/worklist/hifi
 2013-04-09 14:35:39 -07:00
Jeffrey Ventrella
ff53b1573c fixed bug in avatar arm IK prototype 2013-04-09 14:35:29 -07:00
Leonardo Murillo
1cf75b37f3 Changes to interface side of code 2013-04-09 15:30:30 -06:00
ZappoMan
42e1355f1e add back voxels.render() call 2013-04-09 14:11:55 -07:00
Jeffrey Ventrella
e90dd52da4 resolve merge conflicts with origin/master 2013-04-09 13:30:26 -07:00
vincent
4f41aab89a last merge without Curl 2013-04-09 22:17:59 +02:00
Jeffrey Ventrella
87c26a39fb adding more changes and small improvements to camera, and head... 2013-04-09 12:54:59 -07:00
ZappoMan
2ec3f6b210 Adding new AgentTypes.h and moving over to new constants 2013-04-09 10:37:07 -07:00
vincent
56aac7077c changes after merge 2013-04-09 19:12:49 +02:00
Philip Rosedale
60dc43041f added rendering lines between avatar bones 2013-04-08 22:42:45 -07:00
Philip Rosedale
87fd0f7a91 Fixed avatar lighting, head scaling, removed some extra log messages 2013-04-08 21:13:20 -07:00
ZappoMan
6eb503f6d0 hopefully fix build buster 2013-04-08 20:04:24 -07:00
ZappoMan
6079ec2d91 hopefully fix build buster 2013-04-08 20:02:10 -07:00
ZappoMan
ec9bd5efb3 hopefully fix build buster 2013-04-08 19:59:58 -07:00
ZappoMan
17f4c5d184 cleanup of packet header constants 2013-04-08 19:56:42 -07:00
ZappoMan
7480283dd4 cleanup of packet header constants 2013-04-08 19:54:14 -07:00
Jeffrey Ventrella
e6a4647852 added a fix for other av rotation 2013-04-08 18:56:31 -07:00
Jeffrey Ventrella
191ee71dbb Merge remote-tracking branch 'origin' 2013-04-08 18:46:28 -07:00
Jeffrey Ventrella
cd1533dc7c Lots of small changes in the head (evolving into "avatar") to include skeleton. Also, added camera behaviors for navigation 2013-04-08 18:46:00 -07:00
Stephen Birarda
69fa462151 don't steal ping replies from AgentList 2013-04-08 18:10:20 -07:00
ZappoMan
53cfd0ecdd adding CounterStats class and support for showing running average stats on voxels recieved, created, and colored in client 2013-04-08 17:03:22 -07:00
ZappoMan
23429441ac Merge branch 'master' of https://github.com/worklist/hifi 2013-04-08 11:18:51 -07:00
ZappoMan
aee27bfc16 Hmmm, when painting, X and Z are not flipped? I'm totally confused, but now 
but LOD and painting seems to work.
 2013-04-08 11:18:07 -07:00
Philip Rosedale
dbd9688f1f Turned off default for star field rendering until we find/fix the rendering bug 2013-04-08 09:34:19 -07:00
ZappoMan
aa40fd96d4 added -/% to menu text 2013-04-07 12:49:15 -07:00
ZappoMan
d3fd5d1a75 added keyboard commands for erase all and add scene 2013-04-07 12:45:46 -07:00
ZappoMan
5415543dcd adding Z command to voxel server and interface, Z command allows sending "erase all" and "add scene" commands 2013-04-06 12:03:46 -07:00
Jeffrey Ventrella
87fe21f835 got a basic avatar skeleton with a simpler starter user interaction for moving the right hand 2013-04-05 16:21:13 -07:00
Jeffrey Ventrella
a0f09b597a got a basic avatar skeleton with a simpler starter user interaction for moving the right hand 2013-04-05 16:19:23 -07:00
ZappoMan
16ad4fc220 hack to always send voxels to client (even if already visited), added paint mode features to client 2013-04-05 10:54:39 -07:00
Jeffrey Ventrella
5b2d1ec198 thingy3 2013-04-05 10:52:10 -07:00
Jeffrey Ventrella
e57e2bdf38 thingy2 2013-04-05 10:48:08 -07:00
ZappoMan
57829785eb fix to LOD bug caused by flip-flopped X and Z, add color randomization to inserted voxels on server, added head position display to display_stats() 2013-04-04 20:50:51 -07:00
Jeffrey Ventrella
d3f6c19e83 adding Camera and some utility classes and start of prototype avatar 2013-04-04 18:04:32 -07:00
tosh
31262340d4 adjusts formatting to agreed conventions 2013-04-05 01:24:00 +02:00
tosh
284530f7d6 tightens memory use 2013-04-04 11:59:16 +02:00
tosh
de4734d6fb tightens ogl state handling (also fixes unreadably thick text for stats display) 2013-04-04 10:59:57 +02:00
tosh
9046e5e89c silences warning by using pointer to const as string parameter for 'drawtext' 
(conversion of string literals to char* is deprecated)
 2013-04-04 10:55:08 +02:00
ZappoMan
f859d8ed9c Added PaintMode, toggle for stars, etc. 2013-04-03 22:42:02 -07:00
Stephen Birarda
66a2b1a86f move stars.txt to S3 bucket 2013-04-03 15:24:26 -07:00
tosh
2341af271b Merge branch 'master' of git://github.com/worklist/hifi into 19188 
Conflicts:
	interface/CMakeLists.txt
	interface/src/main.cpp
	shared/src/SharedUtil.cpp
	shared/src/SharedUtil.h
	shared/src/VoxelTree.cpp
 2013-04-03 22:44:22 +02:00
tosh
0733f06143 adds cmake support for starfield subdirectory 2013-04-03 22:04:09 +02:00
ZappoMan
9220ba3ee5 Added agentTypes to AgentList::broadcastToAgents() 
Make voxel server rebroadcast "remove voxel" messages to all it's connected heads
Cleaned up processing of Remove voxel messages to live in VoxelTree
 2013-04-03 12:42:24 -07:00
Stephen Birarda
761daf684f don't NULL out buffer data, just draw less 2013-04-01 17:25:31 -07:00
Stephen Birarda
ec6b8d2016 bring MAX_VOXELS_PER_SYSTEM back down to 250k 2013-04-01 17:14:39 -07:00
Stephen Birarda
f38df5579b remove the VBO transfer frequency tests 2013-04-01 15:12:39 -07:00
Stephen Birarda
3135d50ca9 drop redraw frequency to 0.5s 2013-04-01 15:08:20 -07:00
Stephen Birarda
793ac841f2 only allow VBO re-transfer every 5 seconds for test 2013-04-01 14:08:42 -07:00
Stephen Birarda
a0c5dcb3ca correct number of leading bytes for addition of attenuation byte 2013-04-01 13:03:46 -07:00
Stephen Birarda
124fecf8c9 Revert "don't send or parse attenuation for now" 
This reverts commit 1767f2b052.
 2013-04-01 12:28:51 -07:00
ZappoMan
ad0b2f024b Fixed a couple of complier warnings, and added a new PerfStat class for monitoring runtime performance 2013-03-31 20:43:23 -07:00
Stephen Birarda
2de86bfa92 Revert "allow the bad triangles to render" 
This reverts commit b5d1ae1a36.
 2013-03-29 16:22:10 -07:00
tosh
20e7837717 adds #define to disable starfield multithreading support based on C++11 
turns it off by default, for now
 2013-03-29 23:19:16 +01:00
Stephen Birarda
b5d1ae1a36 allow the bad triangles to render 2013-03-29 15:18:34 -07:00
tosh
51afe69864 fixes overload issue with 'std::hypot' with older gcc (Xcode 3.2) 2013-03-29 23:17:53 +01:00
tosh
02d5f6bc62 removes dead, misplaced and commented-out code 2013-03-29 21:28:23 +01:00
vincent
622053b38c #19197 Create basic visual studio 2013-03-29 20:20:52 +01:00
Stephen Birarda
f0e457081b temporarily disable walking noises for demo 2013-03-29 11:34:58 -07:00
tosh
e03bbec6fc adds optional shaders to vary the point size based on the brightness 2013-03-29 19:04:47 +01:00
tosh
002d607e9f adds component to ease use of OpenGL programs (that is pipelines of shaders) 2013-03-29 19:03:28 +01:00
Stephen Birarda
3be5d60fc4 comment out threshold frames to hopefully reduce clicks 2013-03-29 09:17:33 -07:00
Stephen Birarda
1767f2b052 don't send or parse attenuation for now 2013-03-29 08:36:33 -07:00
tosh
8f458b0bea changes case/naming to agreed conventions 2013-03-29 13:41:33 +01:00
tosh
bdf358b0fb removes some leftover debug code 2013-03-29 13:39:46 +01:00
tosh
1eb904ca59 also changes case/naming to agreed conventions in the utility components 2013-03-29 11:54:09 +01:00
tosh
2d997a9a8d inserts synchronization primitives 2013-03-29 11:43:04 +01:00
Stephen Birarda
3186254a93 initial LOD drop off when moving back 2013-03-29 03:42:54 -07:00
Stephen Birarda
80170bd4c4 don't do gross things if data is being written while GPU is copying it 2013-03-29 03:12:11 -07:00
tosh
2b3263e019 splits up Stars.cpp into a module of multiple files 2013-03-29 10:53:30 +01:00
ZappoMan
270f77799d added random color options, cleaned up compiler warnings, add reAverageParentColors when modifying voxel tree 2013-03-28 17:21:47 -07:00
tosh
df7f3942e1 straightens data pipeline and several bugs after exhaustive testing 2013-03-29 01:08:24 +01:00
Stephen Birarda
a7f74a9f40 Merge branch 'master' of github.com:worklist/hifi 2013-03-28 15:30:40 -07:00
Stephen Birarda
f109916125 move the voxel tree back to origin 2013-03-28 15:30:14 -07:00
ZappoMan
ebceaf06dc added --domain command line option to interface 2013-03-28 15:22:10 -07:00
Stephen Birarda
1b3c15a701 Merge remote-tracking branch 'origin/master' 2013-03-28 14:39:59 -07:00
Stephen Birarda
9cd314d3c4 move the voxel system to 40,0,40, only re-render on new voxels 2013-03-28 14:35:02 -07:00
ZappoMan
6ec9949098 Add --local support to interface command line 2013-03-28 14:03:16 -07:00
ZappoMan
ed6195f3a0 Merge branch 'master' of https://github.com/worklist/hifi 2013-03-28 14:00:58 -07:00
ZappoMan
fe8b6f7d63 * Moved load file and create sphere from VoxelSystem to VoxelTree 
* Added --local command line support to domain and voxel servers so that
  you can run them locally without recompiling.
* made command line option parsing more cross platform
* added --NoColorRandomizer to interface when loading local models
* added -i file load support to voxel server to load in a preexisting model at launch
* added --NoRandomVoxelSheet to voxel server to NOT create the built in voxel sheet
* added first cut at 'I' command from clients to voxel server to insert voxels into voxel tree
* changed ambient light settings in interface to not be so aggressive
* added randInIntRange() helper to SharedUtils
* tweat to pruneTree() to also repair child mask
* some coding standard refactoring
 2013-03-28 13:54:28 -07:00
Stephen Birarda
a41b003582 perform proper verification for creation of new sphere 2013-03-28 11:47:23 -07:00
Stephen Birarda
084b77be50 NULL sphere pointer on Head copy 2013-03-28 11:37:49 -07:00
Stephen Birarda
d2a8da890f don't make the eye sphere a global object 2013-03-28 11:36:41 -07:00
vincent
1c1b7369ae #19197 Create basic visual studio 2013-03-28 18:32:52 +01:00
vincent
83abc571f1 #19197 Create basic visual studio 2013-03-28 18:20:50 +01:00
Philip Rosedale
0b044d01d5 always be making random left/right/mouth eye contact 2013-03-27 16:00:40 -07:00
Philip Rosedale
c0cb88e21b Added keyboard controls for smooth rotation, more junk removed from main.cpp 2013-03-27 15:54:54 -07:00
tosh
0a6cdf9da5 bumps the default limit to 200K stars 2013-03-27 15:53:30 +01:00
tosh
8e0fe23ad6 straightens range issues (crucial for higher numbers of stars), 
moves compile time options to top of file,
enables setLOD (test pending), and
adds some debug logging (commented-out)
 2013-03-27 15:51:22 +01:00
tosh
704ae4acb2 removes default limit loading stars 2013-03-27 15:50:25 +01:00
tosh
5350de1c76 makes things run and build on OSX and fixes missing initialization in loader 2013-03-27 13:38:06 +01:00
tosh
ecd64d3244 improves naming consistency (mostly member variable prefixes) 2013-03-27 11:49:43 +01:00
tosh
fcec7bf62f fixes broken debug code 2013-03-27 07:10:43 +01:00
tosh
ecddf9aa76 fault tolerance when 'render' is called prior to loading 2013-03-27 06:55:41 +01:00
tosh
68a62cf8c6 implements FOV culling, most properly 2013-03-27 03:30:51 +01:00
tosh
1327b8852b adds getAspectRatio function 2013-03-27 03:30:25 +01:00
Philip Rosedale
ef9c704bb1 Merge remote-tracking branch 'origin' 2013-03-26 17:33:21 -07:00
Philip Rosedale
642b64dfd6 First commit to improve avatar movement 2013-03-26 17:32:54 -07:00
Stephen Birarda
7c1470c07e remove debug send to 10.0.0.10 2013-03-26 16:22:42 -07:00
Philip Rosedale
e0ee6c269a Added thrust and velocity to avatar head, first part of movement improvements 2013-03-26 11:53:57 -07:00
Stephen Birarda
bb14a90f86 remove constants re-added on merge 2013-03-25 23:00:36 -07:00
ZappoMan
23c6a9017c Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	interface/src/main.cpp
	shared/src/SharedUtil.cpp
	shared/src/SharedUtil.h
 2013-03-25 22:51:59 -07:00
ZappoMan
2f6b2466ea Fixed getCommandOption and cmOptionExists to be more porable 
added support for --NoConnect command line option to test running without connecting
added pruneTree to VoxelTree
 2013-03-25 22:39:24 -07:00
Stephen Birarda
d76fafda67 remove call that included getCmdOption 2013-03-25 16:45:49 -07:00
Stephen Birarda
507b6e0064 use abstracted DS check in method from AgentList 2013-03-25 16:24:14 -07:00
Stephen Birarda
c8190b95aa remove un-needed AgentList include from VoxelSystem 2013-03-25 16:23:42 -07:00
Stephen Birarda
896047d2aa have the mixer additionally attenuate sources based on extra byte 2013-03-25 12:05:32 -07:00
tosh
a8df635c09 adds hack to consider "forgotten" tiles. 
a proper solution (that will also consider screen dimensions / roll) is still pending
 2013-03-25 12:14:12 +01:00
tosh
5475c64ff3 reworks tile selection, 1st step (2nd pending) 2013-03-25 10:51:31 +01:00
tosh
7d32eeb20a adjusts to function renaming in FieldOfView 2013-03-25 10:50:45 +01:00
tosh
721f4fd3b4 tidies viewing - looks much better already. tile selection is still too naive (or not naive enough) 2013-03-25 02:49:31 +01:00
tosh
6a9134d4a5 exposes function to fetch glFrustum arguments 2013-03-25 02:47:24 +01:00
ZappoMan
0711539fc6 Changed colors of spheres to be a gradient along phi between to random colors 
this gives the spheres a little bit more natural look.
Also increased the level of detail (smaller voxels)
 2013-03-24 13:00:23 -07:00
ZappoMan
ef8694dd60 1) Added createSphere() to VoxelSystem to create a sphere 
2) Added pointToVoxel() to SharedUtils, this will give you a voxel code
   given x,y,z,s,r,g,b
3) Added '.' keyboard interface to create a random sphere in the local
   voxel system
 2013-03-24 10:06:43 -07:00
tosh
e965b88c88 implements live LOD and input limit 2013-03-24 14:06:43 +01:00
tosh
5de3ec035b leftover changes / minor corrections 2013-03-24 06:30:33 +01:00
ZappoMan
8ecc0d53ad Added a utility to VoxelSystem for loading voxels from a local file 
Also added a couple shared utility functions for reading command
line options (since that's how you can load a local file at this
point).
 2013-03-23 21:59:27 -07:00
tosh
4444bcf26e starfield and numerous utility components, initial checkin 2013-03-24 05:50:07 +01:00
Stephen Birarda
6346a14cb5 remove voxelServerAddCallback 2013-03-22 10:48:41 -07:00
Stephen Birarda
6712d23cd1 push and pop the matrix for voxel system draw 2013-03-21 17:12:50 -07:00
Stephen Birarda
5f052d7c9e scale back heads after voxel system draw 2013-03-21 17:03:52 -07:00
Stephen Birarda
95926cb7fc conditional chdir for OS X resources, revert windows Head changes 2013-03-21 17:02:41 -07:00
Stephen Birarda
e2a28b48db revert Head.cpp to earlier commit to confirm source of direction changes 2013-03-21 16:51:45 -07:00
Stephen Birarda
d61ae179ae hide the cloud again 2013-03-21 16:16:25 -07:00
Stephen Birarda
0b48eab1fb Merge branch 'master' of github.com:worklist/hifi 2013-03-21 16:12:09 -07:00
Stephen Birarda
4552140f61 add a sound when moving so we aren't ninjas 2013-03-21 16:11:17 -07:00
Kees van Prooijen
f308d8e004 merge with upstream master 2013-03-21 10:10:33 -07:00
Stephen Birarda
f97932353b fix conditional inclusion of voxel in vertices and color arrays 2013-03-20 16:28:28 -07:00
Stephen Birarda
abc0deaa78 increase the far clip 2013-03-20 16:22:24 -07:00
Stephen Birarda
1efbaef44b only add voxel to be drawn if not transparent 2013-03-20 16:21:45 -07:00
Stephen Birarda
e8f84aee78 fix rendering bugs 2013-03-20 15:32:12 -07:00
Stephen Birarda
634e9c4bf7 parse the bitstream tree and create an in memory representation to render 2013-03-20 13:25:11 -07:00
Kees van Prooijen
9ae11ffe77 more windows port 2013-03-20 12:13:14 -07:00
Stephen Birarda
f8f098cf2c Merge branch 'master' of github.com:worklist/hifi 2013-03-19 15:58:19 -07:00
Stephen Birarda
92fc1ed1a6 receive bitstream from voxel server on client 2013-03-19 15:51:48 -07:00
Kees van Prooijen
d70da7f215 some more warning removal, temporarily excluding portaudio for windows 2013-03-19 11:49:36 -07:00
Stephen Birarda
c7213d6593 conditionally include winsock2.h instead of UNIX socket stuff 2013-03-19 11:46:53 -07:00
Stephen Birarda
8ef885aaaf remove extra tokens after endif for WIN32 conditionals 2013-03-19 11:10:42 -07:00
Kees van Prooijen
cd27c74a2d prelimanary changes for windows port 2013-03-19 11:01:08 -07:00
Stephen Birarda
5b8541eaa4 fix conditional implementation of SerialInterface 2013-03-18 16:29:06 -07:00
Stephen Birarda
6a7b40629c remove the unused outstring method 2013-03-18 16:20:39 -07:00
Stephen Birarda
158270f20d only use SerialInterface if on UNIX machine 2013-03-18 15:36:26 -07:00
Stephen Birarda
42fe3ce077 remove unused methods from VoxelSystem 2013-03-15 12:27:00 -07:00
Stephen Birarda
99e21be12c include cstring for memcpy 2013-03-13 13:29:39 -07:00
Stephen Birarda
012b4a92fd add a missing glBindBuffer that caused client to crash on voxel drawing 2013-03-13 11:58:58 -07:00
Stephen Birarda
95eb241fdd remove OS X specific menu, have voxel server point to correct DS 2013-03-13 11:07:46 -07:00
Stephen Birarda
d51f52c307 add back fred's flange, with some tuning 2013-03-12 13:59:19 -07:00
Philip Rosedale
ccd60fa07f Merge remote-tracking branch 'origin' 2013-03-12 10:49:33 -07:00
Stephen Birarda
0739d39568 add missing copy constructors for Head and Hand 2013-03-12 10:42:41 -07:00
Stephen Birarda
f29510ceb0 remove setSourcePosition that re-appeared on merge 2013-03-12 10:24:02 -07:00
stojce
72bdf340e9 additional merge 2013-03-12 18:14:18 +01:00
stojce
8e6c98661b merge conflicts 2013-03-12 18:12:58 +01:00
Stephen Birarda
e97aba03a3 move StdDev to shared library 2013-03-12 10:09:07 -07:00
Philip Rosedale
e3697f22f8 Merge remote-tracking branch 'origin' 2013-03-11 17:28:05 -07:00
Stephen Birarda
4be337d34b only hold the threshold number of frames for audio output 2013-03-11 17:27:27 -07:00
Philip Rosedale
3e62aa5169 Fixed/improved Standard Deviation code used to get jitter 2013-03-11 17:13:18 -07:00
Philip Rosedale
74452b7cc5 manual merge removed ECHO_SERVER_TEST 2013-03-11 16:24:55 -07:00
Philip Rosedale
9f21c76380 Merge remote-tracking branch 'origin/master' 2013-03-11 16:22:16 -07:00
Philip Rosedale
674bd8d798 transmitter full movement, and audio jitter buffer tweaks/debugging data 2013-03-11 16:19:55 -07:00
Stephen Birarda
5d02d563b3 remove the flange until it's ready for primetime 
This reverts commit 5652d0dcd3.
 2013-03-10 15:04:23 -07:00
Philip Rosedale
79f39483d0 Merge remote-tracking branch 'origin' 2013-03-08 18:17:10 -08:00
Stephen Birarda
5652d0dcd3 add a flange effect when turning head with gyros 2013-03-08 17:18:28 -08:00
Philip Rosedale
5c1bd68580 Merge remote-tracking branch 'origin/master' 2013-03-08 16:00:17 -08:00
Philip Rosedale
f014fcd0ac transmitter tweaks 2013-03-08 15:58:49 -08:00
Stephen Birarda
5535b8a4f5 allow client to request loopback from mixer 2013-03-08 15:37:41 -08:00
Stephen Birarda
686404be2b add a voxel server 2013-03-08 14:32:06 -08:00
Philip Rosedale
26fd44f030 100,000 voxel death star with concentric shells 2013-03-06 16:58:38 -08:00
Philip Rosedale
e7aa142082 Merge remote-tracking branch 'origin' 2013-03-06 15:23:40 -08:00
Philip Rosedale
89d205f304 turn cloud back off 2013-03-06 14:45:24 -08:00
Philip Rosedale
f98f64e8f7 Added red 'laser pointer' to hand 2013-03-06 14:40:24 -08:00
Stephen Birarda
f004479e39 bump up to 300000 voxels, with color 2013-03-06 14:34:14 -08:00
Stephen Birarda
e16cd4ffc3 use vertex buffer objects to speed up voxel rendering 2013-03-06 13:56:11 -08:00
Stephen Birarda
0fbb534566 randomly draw 50000 voxels for glDrawElements test 2013-03-06 12:04:27 -08:00
stojce
2a4a7b4ab8 call gluDeleteQuadric only if sphare is initialised 2013-03-06 08:16:40 +01:00
stojce
3b3ab9f68f set texture binding of first render call only 2013-03-06 08:08:18 +01:00
Philip Rosedale
4203fddb88 Transmitter now controls hand position and rotation. 2013-03-04 18:36:50 -08:00
Philip Rosedale
04bd98cf85 Merge remote-tracking branch 'origin' 2013-03-04 17:01:24 -08:00
Philip Rosedale
2903ff9f73 Adding support for transmitter data 2013-03-04 17:00:30 -08:00
Philip Rosedale
f3d086f6dd Merge pull request #10 from heracek/19095 
Code Review for Job #19095
 2013-03-04 16:59:53 -08:00
Stephen Birarda
4648ce033e remove the flanger that isn't working as expected 
This reverts commit a7deca0ced.
 2013-03-04 10:37:55 -08:00
Stephen Birarda
a7deca0ced add a broken flanger 2013-03-04 10:37:48 -08:00
Stephen Birarda
a42fc47231 relink head to AudioRingBuffer, send source bearing 2013-02-28 15:58:57 -08:00
Stephen Birarda
29df6e6a3e send 256 samples per callback so mixer can reply with two channels 2013-02-28 12:21:38 -08:00
Philip Rosedale
1dd3a9970d Eyebrows driven by audio, mouth doesn't turn red. 2013-02-26 18:44:42 -08:00
Philip Rosedale
27cc3a8ee5 Merge remote-tracking branch 'origin' 2013-02-26 17:34:26 -08:00
Philip Rosedale
fe2f2d5019 Reduce mouse force on hand. 2013-02-26 17:33:40 -08:00
Stephen Birarda
31a164fd19 initial changing of volumne of source based on distance 2013-02-26 16:57:33 -08:00
stojce
7bda2c0581 #19069 Add iris textures to avatar head, change lighting 2013-02-27 01:53:07 +01:00
Stephen Birarda
38cdd615a1 switch back to EC2 DS for sanity check 2013-02-27 01:53:07 +01:00
Stephen Birarda
31b93b036e temporary test against birarda's domain server 2013-02-27 01:53:07 +01:00
Stephen Birarda
04f3398466 send interface client position to audio mixer 2013-02-27 01:53:06 +01:00
Stephen Birarda
9e43868191 refactor Audio.cpp in interface to use parseData in ARB 2013-02-27 01:52:56 +01:00
Stephen Birarda
f55782b968 refactor mixer to use AgentList, AudioRingBuffer as AgentData 2013-02-27 01:52:56 +01:00
Philip Rosedale
eb37d1fbf8 Added ability to drag hand by clicking and dragging on the screen. 2013-02-27 01:52:56 +01:00
Philip Rosedale
888ef2249d Added angular velocity and angular movement to hand, changed hand to block. 2013-02-27 01:52:56 +01:00
Stephen Birarda
34b8a7bbeb use getters and setters for all member variables in AgentList and Agent 2013-02-27 01:52:56 +01:00
Stephen Birarda
5910fdd7b7 AgentList returns agents vector and agentSocket by reference 2013-02-27 01:52:55 +01:00
Stephen Birarda
c123990d7a switch back to EC2 DS for sanity check 2013-02-26 13:59:33 -08:00
Stephen Birarda
c645830809 temporary test against birarda's domain server 2013-02-26 13:43:50 -08:00
Stephen Birarda
1783ee5f85 send interface client position to audio mixer 2013-02-26 13:13:40 -08:00
Stephen Birarda
68c978cfde Merge branch 'master' of github.com:worklist/hifi 2013-02-26 10:12:32 -08:00
Philip Rosedale
26a87b3b43 Added critically damped spring behavior to hand, and added simulateHand() routine to main.cpp that uses mouse to correctly move hand controller. 2013-02-26 09:41:16 -08:00
Stephen Birarda
bf94f1f861 refactor Audio.cpp in interface to use parseData in ARB 2013-02-25 17:13:44 -08:00
Stephen Birarda
abfd3a0168 refactor mixer to use AgentList, AudioRingBuffer as AgentData 2013-02-25 17:07:32 -08:00
Philip Rosedale
f7b20a7c9c Added ability to drag hand by clicking and dragging on the screen. 2013-02-25 15:06:28 -08:00
Philip Rosedale
fff4bac53d Merge remote-tracking branch 'origin' 2013-02-25 14:33:22 -08:00
Philip Rosedale
a22cd3680a Added angular velocity and angular movement to hand, changed hand to block. 2013-02-25 14:31:56 -08:00
Stephen Birarda
d211eb6c84 use getters and setters for all member variables in AgentList and Agent 2013-02-25 12:51:52 -08:00
Stephen Birarda
4541a5fe78 AgentList returns agents vector and agentSocket by reference 2013-02-25 12:24:42 -08:00
Philip Rosedale
d272a7de31 Head: Added roll to lean decoupling constants, appropriate physical limits on angles for head, reduced sensitivity. 2013-02-22 22:37:11 -08:00
Stephen Birarda
d31eeda816 fix previous garbage commit 2013-02-22 16:45:03 -08:00
Stephen Birarda
04186664a3 the proper way to temporarily disable hand render 2013-02-22 16:44:29 -08:00
Stephen Birarda
a20a162502 don't move user view with their gyro, temporarily hide hand 2013-02-22 16:43:41 -08:00
Stephen Birarda
88cac51c0c tweak sensitiviy on pitch and yaw changes 2013-02-22 16:28:58 -08:00
Stephen Birarda
2ab58e00ca revert last change to ignore position changes from self-gyro 2013-02-22 16:25:38 -08:00
Stephen Birarda
7d244bbd45 don't allow gyro to move user head for themselves 2013-02-22 16:17:07 -08:00
Stephen Birarda
af48f4aad2 switch back to EC2 domain server 2013-02-22 15:15:25 -08:00
Tomáš Horáček
4403f726bb Merge branch 'master' into 19095 2013-02-23 00:09:26 +01:00
Stephen Birarda
6a16d6e3bb clean up agent killing/re-adding for interface and domain 2013-02-22 14:54:19 -08:00
Stephen Birarda
b4184562e0 Merge remote-tracking branch 'origin/master' 2013-02-22 13:39:20 -08:00
Stephen Birarda
5d2cba0b2a add silent agent removal to AgentList class 2013-02-22 13:38:33 -08:00
Stephen Birarda
345ec8b938 fix threaded socket joins so that socket has timeout on blocking receive 2013-02-22 13:37:57 -08:00
Philip Rosedale
0453445b13 Render own manipulator hand in front of camera 2013-02-22 12:47:28 -08:00
Philip Rosedale
777a00db3e Adding hand data to head broadcast packet. 2013-02-22 12:28:27 -08:00
Stephen Birarda
200982dddc fix for UDPSocket receive crash in Audio class and main.cpp 2013-02-22 12:20:16 -08:00
Philip Rosedale
014fdcc618 Tweaked hand 'length' 2013-02-22 12:20:01 -08:00
Philip Rosedale
41259f9ae0 Changed Hand to be a floating 'paddle' in front of the head 2013-02-22 12:10:29 -08:00
Tomáš Horáček
7d73ca9b41 code cleanup 2013-02-22 18:46:41 +01:00
Tomáš Horáček
36a558d123 add "Scope" menu functionality 2013-02-22 18:38:25 +01:00
Tomáš Horáček
4741eb869e add Mac OS X "Scope" menu with empty action 2013-02-22 18:22:16 +01:00
Stephen Birarda
e7fc997f78 push and pop when drawing agent heads 2013-02-21 16:55:20 -08:00
Stephen Birarda
aa9f4f966e allow switchover to new audio mixer received from audio server 2013-02-21 15:43:52 -08:00
Stephen Birarda
1e00962fb7 fix crash on match to active socket, remove LD debug 2013-02-21 15:08:23 -08:00
Stephen Birarda
0becd86e6c show correct number of agents nearby 2013-02-21 15:04:17 -08:00
Stephen Birarda
4a60c5a07b switch back to EC2 domain server 2013-02-21 15:02:33 -08:00
Stephen Birarda
27c4702c7e move to agent head position before drawing it 2013-02-21 14:45:33 -08:00
Stephen Birarda
9ec51116d5 fix unecessary copy of Agent, blow away linkedData to rebuild it 2013-02-21 14:36:53 -08:00
Stephen Birarda
ea43988173 resolve conflicts on merge with master 2013-02-21 13:00:02 -08:00
Stephen Birarda
060f4dceca use AgentData class to abstract implemenation of linked data 2013-02-21 12:56:57 -08:00
Philip Rosedale
67115ccad4 First commit of 'Death Star' voxel planet 2013-02-21 11:25:52 -08:00
Philip Rosedale
5f60bf6376 recursive position vector is same as rendering. 2013-02-20 21:42:10 -08:00
Philip Rosedale
15fd9638d6 remove deadhead (of self) at origin. First commit of voxels with LOD, recursive test pattern. 2013-02-20 21:38:42 -08:00
Stephen Birarda
c57380012e hook domain server up to AgentList, pack sockets 2013-02-20 18:32:23 -08:00
Stephen Birarda
7205817476 remove AgentSocket abstraction to use sockaddr struct 2013-02-20 11:44:35 -08:00
Stephen Birarda
42927ec602 implement pingAgents method in AgentList 2013-02-19 17:46:49 -08:00
Stephen Birarda
9a514f56e5 have AgentList control the required UDPSocket instance 2013-02-19 17:34:34 -08:00
Stephen Birarda
9d5a800c6f begin abstraction of Agent communication to shared classes 2013-02-19 16:38:57 -08:00
Stephen Birarda
6c70d264ac fix company name in header comments 2013-02-19 12:50:23 -08:00
Philip Rosedale
fd151fb7bc trivial change for gyro fix 2013-02-18 16:42:19 -08:00
Stephen Birarda
741654e13d don't print RAW packet to stdout 2013-02-18 16:35:45 -08:00
Stephen Birarda
307fa9e5fa point to EC2 domain server instead of local machine 2013-02-18 16:33:31 -08:00
Stephen Birarda
dcb0e5add2 copy resources to OS X application bundle 2013-02-18 11:39:29 -08:00
Stephen Birarda
9774dd5874 don't kill serial when polling too quickly 2013-02-18 10:37:00 -08:00
Stephen Birarda
fd73b8de82 always store ports as unsigned short ports 2013-02-18 09:50:15 -08:00
Stephen Birarda
c3c0793ddc mixer needs to send port as unsigned short 2013-02-18 09:39:52 -08:00
Stephen Birarda
612662c475 actually allocate memory for the agent private address 2013-02-18 09:36:47 -08:00
Stephen Birarda
0cea1e80ff fix memory overwrite in domain server 2013-02-18 09:30:50 -08:00
Philip Rosedale
c0968e9967 Merge remote-tracking branch 'origin' 2013-02-18 09:17:54 -08:00
Stephen Birarda
615f04982c quick fix to allow mixer on machine with domain server 2013-02-18 09:11:57 -08:00
Philip Rosedale
87b52b5d90 Merge remote-tracking branch 'origin' 2013-02-18 09:00:06 -08:00
Philip Rosedale
bd45740dc6 Partial progress on new voxel model. 2013-02-18 08:59:44 -08:00
Stephen Birarda
c6a8f6415e switch back to EC2 domain server for test 2013-02-18 08:56:32 -08:00
Stephen Birarda
d1433aa2bd a bad version of UDP hole punching for local agents 2013-02-18 08:53:16 -08:00
Philip Rosedale
b05909cf00 More avatar look changes 2013-02-15 17:12:52 -08:00
Philip Rosedale
31ce33f3a3 Fly turn and strafe faster 2013-02-15 17:02:10 -08:00
Philip Rosedale
01767719eb Merge remote-tracking branch 'origin' 2013-02-15 16:46:23 -08:00
Philip Rosedale
514a373acd Partial commit with head render angle fixes 2013-02-15 16:45:50 -08:00
Stephen Birarda
8e4e5d049b fix bad conditional serial pairing 2013-02-15 15:08:05 -08:00
Stephen Birarda
660630e981 discard initial garbage reads, reset properly on disconnect 2013-02-15 15:06:09 -08:00
Stephen Birarda
d0203158c8 initial setup of polling for newly connected headset 2013-02-15 14:58:07 -08:00
Philip Rosedale
ba683de026 Merge remote-tracking branch 'origin' 2013-02-15 12:54:20 -08:00
Philip Rosedale
27860b1f07 Added stats display of agent ping times and various agent functions to get the data. 2013-02-15 12:53:21 -08:00
Stephen Birarda
da8fd5f4ee hook space server up to shared UDPSocket class 2013-02-14 16:45:00 -08:00
Philip Rosedale
c360fabd96 Domain IP is used if static, else looked up. 2013-02-14 13:20:06 -08:00
Philip Rosedale
10ff074e38 Don't render head if you are inside it (it's your own) 2013-02-14 13:14:01 -08:00
Stephen Birarda
864bcb0a03 Merge branch 'master' of github.com:worklist/hifi 2013-02-13 20:43:20 -08:00
Stephen Birarda
9c822b9d58 dynamic switchover of audio mixer 2013-02-13 20:43:10 -08:00
Philip Rosedale
49201efbb1 Merge remote-tracking branch 'origin' 2013-02-13 20:40:38 -08:00
Philip Rosedale
12e4e15b21 It's entirely possible that the serialInterface reader is a tiny bit better, but I'm really not sure. :) Fixed bug with reading from middle of serial string on startup causing hang. 2013-02-13 20:40:00 -08:00
Stephen Birarda
ff83335123 undo solo test for mixer, add localhost mixer const to Audio.cpp 2013-02-13 16:19:31 -08:00
Stephen Birarda
815783732c make UDPSocket non-blocking, thread receive of data in interface 2013-02-13 15:27:16 -08:00
Stephen Birarda
28beb3ecfc undo changes to interface constants 2013-02-13 13:44:26 -08:00
Stephen Birarda
09dee91279 collect agent address on receive to send back audio 2013-02-13 13:42:23 -08:00
Philip Rosedale
9ad121ea00 Now looking up IP address of domain server on startup. 2013-02-13 11:50:10 -08:00
Philip Rosedale
f8cd82bd82 Merge remote-tracking branch 'origin' 2013-02-13 10:53:20 -08:00
Philip Rosedale
ecc7eee161 changed to EC2 domain server by default in interface, increased domain server keep alive timeout to 5 seconds. 2013-02-13 10:53:03 -08:00
Stephen Birarda
f371b5e21c Merge branch 'master' of github.com:worklist/hifi 2013-02-13 10:47:34 -08:00
Stephen Birarda
fb31765024 AudioRingBuffer is a shared class (between mixer and interface) 2013-02-13 10:47:10 -08:00
Philip Rosedale
4ed1971276 Made oscilloscope 2 channel, turned on by default (need to fix injecting the last audio buffer tho). 2013-02-13 10:14:31 -08:00
Philip Rosedale
53a3d1f8c9 Added audio waveform oscilloscope, fixing head rendering of other agents and self. 2013-02-12 23:27:36 -08:00
Philip Rosedale
9d368adcd2 Merge remote-tracking branch 'origin' 2013-02-12 20:48:59 -08:00
Philip Rosedale
8d5a53b2c9 Added agent type to domain server, interface client 2013-02-12 20:48:09 -08:00
Stephen Birarda
fab10ada3e move shared UDPSocket class to shared dir for reuse in mixer 2013-02-12 17:31:53 -08:00
Stephen Birarda
49d7e34cd9 fix casing of util.h import in Agent.cpp 2013-02-12 16:02:07 -08:00
Philip Rosedale
98612c8705 Merge remote-tracking branch 'origin' 2013-02-12 13:18:59 -08:00
Philip Rosedale
a48d9ecd95 Added ping detection between agents 2013-02-12 13:18:19 -08:00
Stephen Birarda
b426ea52d5 fix unused fread return value warning 2013-02-12 12:11:24 -08:00
Philip Rosedale
6f9d223454 Fixed network-to-host byte order problems when storing ports. 2013-02-12 10:58:30 -08:00
Philip Rosedale
b19fce1b46 close socket added 2013-02-12 01:54:14 -08:00
Philip Rosedale
b651032b06 Merge remote-tracking branch 'origin/master' 2013-02-12 01:52:23 -08:00
Philip Rosedale
82594c31ba stop failing texture load at startup, always show nearby agent count 2013-02-12 01:50:12 -08:00
Philip Rosedale
b58bb6fe80 Head data streaming to other users, domain server improved, network.cpp removed and replaced with UDPSocket objects, input audio drives mouth color and size. 2013-02-12 01:41:36 -08:00
Stephen Birarda
b45286c6e5 add copied AudioRingBuffer for mixer, comment crashing mouse calls 2013-02-11 17:16:18 -08:00
Stephen Birarda
b3375c5e5f fix crash by closing socket before deleting audio data 2013-02-11 17:07:56 -08:00
Stephen Birarda
b3a343f17f build portaudio as external project before interface 2013-02-08 17:28:22 -08:00
Stephen Birarda
99b96ec737 build portaudio library to link with interface 2013-02-08 15:58:12 -08:00
Stephen Birarda
8b18238be3 include cstring for use of strcpy 2013-02-08 15:08:27 -08:00
Stephen Birarda
f1467b2f6c fix incorrect casing on include of Util.h 2013-02-08 15:04:31 -08:00
Stephen Birarda
9dc6c1124b include the correct library for printf 2013-02-08 15:03:17 -08:00
Stephen Birarda
7f0ee90486 include cstring for printf function 2013-02-08 15:02:03 -08:00
Stephen Birarda
08142a8adb add header for glut to conditional include in InterfaceConfig 2013-02-08 14:57:59 -08:00
Stephen Birarda
ca0f285abe include InterfaceConfig in Head.cpp for GLUT 2013-02-08 14:51:50 -08:00
Stephen Birarda
d394035e7e switch back to ARB functions with glext include 2013-02-08 14:49:12 -08:00
Stephen Birarda
9095508238 define GL_GLEXT_PROTOTYPES for glPointParameter use 2013-02-08 14:43:22 -08:00
Stephen Birarda
d79bf39a24 using OpenGL later than 2, remove ARB from calls 2013-02-08 14:09:44 -08:00
Stephen Birarda
4983cc6973 conditional include to fix glPointParameterfvARB crash 2013-02-08 14:03:24 -08:00
Stephen Birarda
54b4762830 conditional Apple OS include of call to glPointParameterfvARB 2013-02-08 14:01:35 -08:00
Stephen Birarda
95dc030f19 fix casing of include of finger.h 2013-02-08 13:59:09 -08:00
Stephen Birarda
0c570f5ed5 import cstring for memset and memcpy 2013-02-08 13:57:38 -08:00
Stephen Birarda
8e412f7f40 fix casing on include of world.h 2013-02-08 13:54:45 -08:00
Stephen Birarda
7ff2441c84 conditionally only call glPointParameterfARB if Apple OS 2013-02-08 13:53:26 -08:00
Stephen Birarda
2be4e509c7 change conditional check for GL_ARB_point_parameters 2013-02-08 13:37:04 -08:00
Stephen Birarda
08e96b365b conditional use of glPointParameterfvARB based on GL_ARB_point_parameters 2013-02-08 13:31:42 -08:00
Stephen Birarda
71713cf265 conditional inclusion of glext.h for non-apple OS 2013-02-08 13:28:36 -08:00
Stephen Birarda
b339e47be2 glut should be only inlude required for OpenGL 2013-02-08 13:25:34 -08:00
Stephen Birarda
98fc8418b1 condtional inclusion of glext for UNIX build 2013-02-08 13:21:25 -08:00
Stephen Birarda
70bddbbfed include glext for glPointParameterfvARB method 2013-02-08 13:16:49 -08:00
Stephen Birarda
8bac08859e include cstring for strlen function 2013-02-08 13:14:06 -08:00
Stephen Birarda
cedb212597 make Field a proper class to avoid duplicate symbols 2013-02-08 13:11:56 -08:00
Stephen Birarda
d75541bb69 include stdint.h for references to int16_t type 2013-02-08 12:54:07 -08:00
Stephen Birarda
2d08ce0b7d capitalize import of Finger.h 2013-02-08 12:50:09 -08:00
Stephen Birarda
a1a8cd723d provide type to structs for ISO C++ compliance 2013-02-08 12:49:02 -08:00
Stephen Birarda
c575974060 don't initialize samplecount in header 2013-02-08 12:46:47 -08:00
Stephen Birarda
a4fb6e01aa include cstring for strlen on UNIX 2013-02-08 12:31:21 -08:00
Stephen Birarda
b524a38559 fix mising capitilazation for util include 2013-02-08 12:19:34 -08:00
Stephen Birarda
13a0597ab6 dynamic header for GLUT include 2013-02-08 12:17:35 -08:00
Philip Rosedale
58e96f0ab8 Merge branch 'master' of github.com:worklist/hifi 2013-02-07 20:09:29 -08:00
Stephen Birarda
0359cdbc12 merge with origin/master 2013-02-07 17:30:08 -08:00
Stephen Birarda
f5cbe7a05a cmake build working for interface project 2013-02-07 17:29:01 -08:00
Stephen Birarda
f9b8d6cde0 don't use find module for glm/portaudio 2013-02-07 12:24:05 -08:00
Stephen Birarda
4860fb086d link glm library to interface target 2013-02-07 11:41:01 -08:00
Stephen Birarda
24240a709c add all extra CMake files to gitignore 2013-02-06 18:26:19 -08:00
Stephen Birarda
1111e4837e intial restructuring for CMake setup 2013-02-06 18:07:36 -08:00