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

429 commits

Author SHA1 Message Date
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
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
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
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
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
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
Philip Rosedale
d046162eaf Merge remote-tracking branch 'upstream/master' 2013-04-16 20:32:32 -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
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
tosh
3be23b3faa integrates logging 2013-04-17 00:48:27 +02:00
Jeffrey Ventrella
fcbf44cad9 trying to get around git confusion 2013-04-16 15:11: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
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
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
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
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
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
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
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
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
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
5a8c5ff011 coding standards clean up 2013-04-12 16:55:57 -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
6d7f343be8 draw a test sphere around my hand in orldspace 2013-04-12 16:13:40 -07:00
Philip Rosedale
524ed7deb6 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-12 15:35:02 -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
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
Philip Rosedale
f1bf7d0eb5 trivial test, removed one unneeded variable 2013-04-11 17:35:32 -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
556f11a0c0 added test 'other' avatar for proxemixs testing 2013-04-11 15:32:35 -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
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
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
8d5ee616ac Added a debug menu option 2013-04-10 16:58:53 -07:00
Stephen Birarda
6270659cdc inline declaration and initialization for menu 2013-04-10 16:56:15 -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
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
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
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
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
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
ZappoMan
597f35db3d moved vector math helpers to Utils.cpp/h 2013-04-10 09:39:43 -07:00
ZappoMan
fc122f23d2 added first cut at view frustum debuging code 2013-04-10 01:32:01 -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
Jeffrey Ventrella
1b833fb4a9 added grid plane to aid in testing avatar navigation 2013-04-09 21:14:24 -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