Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-19 20:09:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
1645 commits 25 branches 0 tags 1.1 GiB
Commit graph

408 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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