Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-12 12:53:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
2237 commits 76 branches 59 tags 1.2 GiB
Commit graph

77 commits

Author SHA1 Message Date
Jeffrey Ventrella
9d17df27bf Merge remote-tracking branch 'upstream/master' 2013-05-07 18:33:21 -07:00
Jeffrey Ventrella
2d8c15e0cb cleaned up some spacing issues in Orientarion class 2013-05-07 18:32:56 -07:00
Stephen Birarda
8daae1dd1d bring eve closer to the ground after scale changes 2013-05-07 15:11:01 -07:00
Stephen Birarda
11b2271b91 size of agent ID must be included in bytes read per avatar 2013-05-07 15:05:31 -07:00
Stephen Birarda
0566330a8a some magic number removals 2013-05-07 12:44:45 -07:00
Stephen Birarda
4eeb1ed5b1 have interface clients tell the avatar-mixer and voxel-server what their ID is 2013-05-07 12:05:19 -07:00
Jeffrey Ventrella
aeb545656e (1) added a few methods to orientation; (2) fixed Eve's height; (3) added pitch and roll members to Avatar (not used yet); added avatar pull from handshake; 2013-05-01 15:38:55 -07:00
Jeffrey Ventrella
b388e9a760 (1) re-designed and debugged the orientation class and cleaned up quaternion code, and fixed issues in camera and main related to yaw and camera transforms (2) improved hand-holding algorithm 2013-05-01 13:00:08 -07:00
Andrzej Kapolka
46041b2ed9 Style tweaks: preface privates with underscore, capitalize enum members. 2013-04-26 10:21:14 -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
Stephen Birarda
cdb8b1b144 Merge remote-tracking branch 'upstream/master' into agentlist-array 2013-04-25 16:40:20 -07:00
Stephen Birarda
215efe3b78 bunch of const changes for glm::vec3 in Avatar and Orientation 2013-04-25 16:10:55 -07:00
Andrzej Kapolka
d5da35e91a Merge branch 'master' of https://github.com/worklist/hifi 2013-04-25 15:41:57 -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
Andrzej Kapolka
675d06e4b9 More chat bits; basic functionality now working. 2013-04-25 14:03:31 -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
f538e2bdbc Added key state to avatar data, started on chat entry field. 2013-04-24 17:06:55 -07:00
Stephen Birarda
87386cb05a line the consts back up in AvatarData 2013-04-24 13:54:35 -07:00
Stephen Birarda
461ca6ecb4 revert some of the const changes that make sense 2013-04-24 13:51:27 -07:00
Stephen Birarda
a423d3c38f more const repairs in AvatarData 2013-04-24 13:49:24 -07:00
Stephen Birarda
142a8a6f08 remove double const in AvatarData.h 2013-04-24 13:45:17 -07:00
Stephen Birarda
cfbe8a719c fix getter for hand state in AvatarData 2013-04-24 12:39:25 -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
Philip Rosedale
5556686875 Fixes from brad's review 2013-04-23 11:59:43 -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
Stephen Birarda
79d547e9d0 fix return of bytes read to push pointer forwards 2013-04-22 18:41:12 -07:00
Stephen Birarda
4956370d52 have parseData return the number of bytes consumed 2013-04-22 18:05:27 -07:00
Stephen Birarda
ea5a247f93 view frustum additions means there are now 94 bytes per avatar 2013-04-22 16:22:06 -07:00
ZappoMan
7c73964836 code review cleanup 2013-04-22 15:07:46 -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
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
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
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
Stephen Birarda
651f7434a8 don't constantly print hand position to log 2013-04-18 10:46:44 -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
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
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
4e12f26467 added _isMine check for my _bodyYaw update 2013-04-17 18:10:32 -07:00
Philip Rosedale
6ad12e15ed Merge remote-tracking branch 'upstream/master' 2013-04-17 17:51:32 -07:00
Jeffrey Ventrella
de3de7b878 Merge remote-tracking branch 'upstream/master' 2013-04-17 17:50:08 -07:00
Philip Rosedale
557bf79e0a body yaw debugging (commented out) 2013-04-17 17:49:26 -07:00
Jeffrey Ventrella
aba20c6afd a few debugging changes 2013-04-17 17:48:08 -07:00
birarda
3819185bc2 Merge pull request #75 from birarda/master 
fix unpack of angle in AvatarData
 2013-04-17 17:42:11 -07:00
Stephen Birarda
4340f127e1 cast max uint16_t to float for angle unpack 2013-04-17 17:41:37 -07:00