Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-06-03 16:40:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85615 commits 22 branches 28 tags 1.2 GiB
Commit graph

1795 commits

Author SHA1 Message Date
Brad Hefta-Gaub
b9bca46c6b fix sign warning 2014-01-16 11:24:42 -08:00
Andrew Meadows
1266ffd0ca merge of windows-build 
Conflicts:
	domain-server/src/DomainServer.cpp
	interface/src/Application.cpp
	interface/src/Menu.cpp
	libraries/avatars/src/AvatarData.h
	libraries/shared/src/NodeList.h
 2014-01-16 09:00:13 -08:00
Andrew Meadows
76e8eb2bfc Moving SIXENSE_CONTROLLER_ID* constants into header to help eliminate magic numbers in other code (to be committed later). 2014-01-15 16:53:27 -08:00
Andrew Meadows
32f3621855 merge upstream work into local repo 2014-01-15 14:13:48 -08:00
Brad Hefta-Gaub
170dbe6e85 Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	assignment-client/src/audio/AudioMixer.cpp
	domain-server/src/DomainServer.cpp
	interface/src/Audio.cpp
	interface/src/DataServerClient.cpp
	interface/src/Oscilloscope.cpp
	interface/src/PairingHandler.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/devices/Faceshift.cpp
	interface/src/devices/SerialInterface.cpp
	interface/src/renderer/FBXReader.cpp
	libraries/avatars/src/AvatarData.h
	libraries/octree-server/src/OctreeServer.cpp
	libraries/octree-server/src/OctreeServer.h
	libraries/octree/src/ViewFrustum.cpp
	libraries/shared/src/Logging.cpp
	libraries/shared/src/Node.cpp
	libraries/shared/src/Node.h
	libraries/shared/src/NodeList.cpp
	libraries/shared/src/NodeList.h
	libraries/shared/src/PerfStat.cpp
	libraries/shared/src/SharedUtil.cpp
	libraries/voxels/src/VoxelTree.cpp
	voxel-edit/src/main.cpp
 2014-01-15 10:20:21 -08:00
Andrew Meadows
af3fae7bbf Merge upsteam master into current project (experimental hand paddles) 
Conflicts:
	interface/src/avatar/Avatar.cpp
	libraries/avatars/src/AvatarData.cpp
 2014-01-14 16:39:46 -08:00
Stephen Birarda
599e3bb9e5 resolve conflicts on merge with upstream master 2014-01-14 16:15:58 -08:00
Andrew Meadows
eb207efe32 Adding simple CollisionInfo class as data wrapper and a findSphereCollision() method to AgentData API. 2014-01-14 16:11:27 -08:00
Stephen Birarda
274989935d resolve conflicts on merge with upstream master 2014-01-14 16:09:12 -08:00
Stephen Birarda
767a241105 Merge remote-tracking branch 'upstream/master' into nodelist-container 2014-01-14 16:08:58 -08:00
Andrew Meadows
f28fc5f79b Adding palm accessor method that fetches left or right, as specified. 2014-01-14 16:08:40 -08:00
Stephen Birarda
987c639e36 initial newline removal from all QDebug calls 2014-01-14 13:09:22 -08:00
Stephen Birarda
7d1a64ca8c change NodeList container to QHash with QSharedPointer 2014-01-13 17:09:21 -08:00
Brad Hefta-Gaub
392ff94ebe Merge branch 'master' of git://github.com/worklist/hifi into windows_build 
Conflicts:
	interface/src/DataServerClient.cpp
	interface/src/avatar/MyAvatar.cpp
	libraries/avatars/src/AvatarData.h
 2014-01-13 15:06:26 -08:00
Stephen Birarda
42e3bcfe91 allow fade scale to get smaller than minimum avatar scale 2014-01-13 13:52:41 -08:00
Stephen Birarda
3f2c6504a6 fix for avatar scale bug, closes #1506 2014-01-13 12:27:47 -08:00
Brad Hefta-Gaub
55babbf7b6 windows type mismatch warning fixes 2014-01-13 00:30:23 -08:00
Brad Hefta-Gaub
b0f8e21d06 more windows build hackery 2014-01-10 20:36:37 -08:00
Philip Rosedale
f0460bac5f Merge pull request #1492 from stojce/19466 
Code Review for Job #19466
 2014-01-10 11:19:43 -08:00
Andrzej Kapolka
e37203d833 The overloaded function should be const, true. 2014-01-03 17:59:15 -08:00
stojce
2814cca9af #19466 - Add avatar scale to preferences panel 2014-01-03 21:02:56 +01:00
Andrew Meadows
d520adba98 exposed getVelocity() and findSpherePenetration() in Avatar base class 2014-01-02 09:31:24 -08:00
Philip Rosedale
9786d1b21d Merge pull request #1404 from PhilipRosedale/master 
Fix to see other people animate hydra hands
 2013-12-18 16:43:43 -08:00
Philip Rosedale
17f35ce97b Fix to see other people animate hydra hands 2013-12-18 16:37:15 -08:00
ZappoMan
4b3fd2166d make getNumPalms() const 2013-12-17 15:28:29 -08:00
ZappoMan
4bfdce3910 Merge branch 'master' of https://github.com/worklist/hifi into controller_scripting_interface 
Conflicts:
	libraries/avatars/src/HandData.h
	libraries/script-engine/src/ScriptEngine.cpp
	libraries/script-engine/src/ScriptEngine.h
 2013-12-17 15:25:12 -08:00
ZappoMan
a6e6205a57 first cut at scriptable controller 2013-12-17 15:23:09 -08:00
Philip Rosedale
ae1cc99f3d throwing from fingertips, less gravity, lighter target rendering 2013-12-17 12:48:59 -08:00
Philip Rosedale
fc28034f37 hydra hands hard coded to LH and RH controllers, ball debugging 2013-12-17 09:41:13 -08:00
Philip Rosedale
14d198f930 Merge remote-tracking branch 'upstream/master' into slaps 2013-12-16 21:20:05 -08:00
ZappoMan
d9f412406f better implementation of particle palm collisions 2013-12-16 18:12:47 -08:00
Philip Rosedale
be27f36a7e Merge remote-tracking branch 'upstream/master' into slaps 2013-12-16 17:37:22 -08:00
ZappoMan
6203e9dc2e Merge branch 'master' of https://github.com/worklist/hifi into particle_voxel_collisions 
Conflicts:
	interface/src/Application.cpp
	interface/src/Menu.cpp
	interface/src/Menu.h
	interface/src/avatar/Hand.cpp
 2013-12-16 12:11:33 -08:00
Philip Rosedale
ce986c367e palms detect collision 2013-12-15 19:53:24 -08:00
Philip Rosedale
21d7fe1277 Grab and move with button 4 2013-12-13 21:59:19 -08:00
ZappoMan
02d3d384ca added basic support for hit particles with the palm of the hand 2013-12-13 19:02:45 -08:00
ZappoMan
38d928fa4e make balls for both hands, allow you to change color, remove red wire simulation 2013-12-13 11:58:12 -08:00
Philip Rosedale
c9f96d1adf Basic joystick thrust/view drive behavior 2013-12-10 16:52:08 -08:00
Philip Rosedale
83a1654d9c making toy ball 2013-12-09 15:12:28 -08:00
Andrzej Kapolka
d374716c7d Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 17:09:19 -08:00
Philip Rosedale
3f957bbf5d Rave out! 2013-12-05 16:46:11 -08:00
Andrzej Kapolka
193f676fcb Merge branch 'master' of https://github.com/worklist/hifi 2013-12-05 10:18:50 -08:00
ZappoMan
2b27c91550 Merge branch 'master' of https://github.com/worklist/hifi into particle_server 
Conflicts:
	interface/src/VoxelSystem.cpp
	interface/src/VoxelSystem.h
 2013-12-04 11:40:54 -08:00
ZappoMan
9faef65ccc first cut at splitting out octree base classes 2013-12-03 17:32:02 -08:00
Andrzej Kapolka
70ca1106b1 Working on testing the Leap/Hydra hands against the avatar body. 2013-12-03 17:28:36 -08:00
Philip Rosedale
8fdd78dc26 Added drum sounds and voxel collision detection 2013-12-03 16:25:23 -08:00
Philip Rosedale
a84e97c54a Removed obsolete HandControl class, files 2013-12-03 08:29:17 -08:00
Philip Rosedale
7ab9cc9c14 Voxel editing with hands, flying and rotation with hands 2013-12-02 00:17:06 -08:00
Philip Rosedale
a9139b05e8 Drive with trigger pointing 2013-11-29 20:46:16 -08:00
Philip Rosedale
65ec91ec13 Add hand thrusters 2013-11-29 17:49:35 -08:00
Philip Rosedale
abca79ea3e Add button detection for hydra controller to palmData 2013-11-29 16:20:43 -08:00
Philip Rosedale
9680941500 Add palm velocity 2013-11-29 14:50:18 -08:00
Andrzej Kapolka
ac714773d3 Initialize chat circling flag. 2013-11-27 13:13:36 -08:00
Andrzej Kapolka
cabd6ccbad Advertise to others whether we have chat circling enabled, only include people 
with it enabled when doing the computations.
 2013-11-27 11:47:23 -08:00
Andrzej Kapolka
083800dc59 Glow/shrink avatars when killed, send kill message when we move between 
domains, locations, etc.
 2013-11-22 16:23:40 -08:00
ZappoMan
0368e8c75e cleanup bit field positions 2013-10-24 14:27:47 -07:00
ZappoMan
015adeedcb first cut at splitting out PACKET_TYPE_VOXEL_QUERY from PACKET_TYPE_HEAD_DATA 2013-10-24 13:22:31 -07:00
Stephen Birarda
8f1135feb7 more repairs to Agent and AvatarData for UUID transition 2013-10-17 14:35:42 -07:00
Stephen Birarda
628a3ba489 fixes to AvatarMixer for new UUID setup 2013-10-17 12:10:27 -07:00
Stephen Birarda
1c70e09178 repairs to audio exchange for new UUID setup 2013-10-17 11:58:52 -07:00
Stephen Birarda
fa146e302d remove 16-bit node IDs and replace with UUIDs 2013-10-17 11:49:41 -07:00
Stephen Birarda
515e2d5a23 handle conflicts on merge with upstream master 2013-10-11 14:24:05 -07:00
Stephen Birarda
8bac70e4a5 pass UUID from data-server to avatar-mixer 2013-10-08 13:43:31 -07:00
Stephen Birarda
6bd71da84e pack the UUID with the avatar data 2013-10-08 13:31:39 -07:00
Stephen Birarda
e977d28fe3 replace QVariantMap glm::vec3 setters with conversions for QScriptValue 2013-10-03 11:55:30 -07:00
Andrzej Kapolka
91999dfe1f Pupil dilation. 2013-09-26 15:48:11 -07:00
Andrzej Kapolka
a04ced633e Include the face model URL in the same packet as the avatar voxel URL. 2013-09-19 16:35:25 -07:00
Andrzej Kapolka
1bd8ea947a Merge branch 'master' of https://github.com/worklist/hifi into blendface 2013-09-18 17:14:58 -07:00
Andrzej Kapolka
558d3d41a6 First attempt at blending. 2013-09-17 15:22:06 -07:00
Stephen Birarda
17fda717fe move audio and avatar classes into assignment-client target 2013-09-17 11:04:46 -07:00
Andrzej Kapolka
354c173c9f Disable sending coefficients for now. 2013-09-17 09:58:54 -07:00
Andrzej Kapolka
1fce6c717b Working on shipping around the complete set of blendshape coefficients. 2013-09-16 17:28:04 -07:00
atlante45
fe12437da9 Fixed double declaration in broadcastData 2013-09-13 16:46:48 -07:00
atlante45
8f27d22f7b Put _isFaceshiftConnected in a bit set 2013-09-13 14:57:30 -07:00
atlante45
c2502d03db Merge branch 'master' of https://github.com/worklist/hifi into add_fs_data_in_head_data 2013-09-13 13:25:41 -07:00
Stephen Birarda
d089991237 add handling of Agent assignments to Assignment, DS, AC 2013-09-13 11:14:00 -07:00
atlante45
7cd2f2b06b send faceshift data to avatar mixer 2013-09-12 17:41:26 -07:00
Stephen Birarda
b0c9dfeddc more leveraging of standardized logging 2013-09-09 14:47:15 -07:00
Stephen Birarda
9eef894e24 add doxygen documentation for Assignment classes 2013-09-06 14:35:59 -07:00
Stephen Birarda
d412e0611d Merge branch 'master' of github.com:worklist/hifi into assignment 2013-09-06 11:04:18 -07:00
Stephen Birarda
f7b0158cfe use deque of pointers, make sure DS silent count is refreshed 2013-09-06 10:26:29 -07:00
Stephen Birarda
9244ec1c25 have client keep track of number of silent DS checkins 2013-09-06 09:41:27 -07:00
Stephen Birarda
8b601cac0a moved the AvatarMixer to a class the assignment-client can handle 2013-09-05 14:01:05 -07:00
Andrzej Kapolka
4961913fc4 Transmit the eye offset position along with the rest of the frustum 
parameters.
 2013-09-05 12:20:15 -07:00
Stephen Birarda
609c48214f Revert "temporary removal of QtScript dependency for build on ec2 box" 
This reverts commit f29f8701a1.
 2013-09-04 16:22:51 -07:00
Stephen Birarda
f29f8701a1 temporary removal of QtScript dependency for build on ec2 box 2013-09-04 16:20:19 -07:00
atlante45
b8c18bee2d merge 2013-09-04 15:31:12 -07:00
atlante45
5da525fc3e memory wastes and code cleaning PR comments 2013-09-04 15:12:24 -07:00
atlante45
b03482ead5 Some more memory leaks and codes formatting 2013-09-03 17:16:06 -07:00
Stephen Birarda
24a43c050c require Qt5Script for avatars library 2013-08-28 10:55:38 -07:00
Stephen Birarda
50e062edf2 some spacing cleanup in AvatarData 2013-08-15 16:06:48 -07:00
Stephen Birarda
154c6b4f32 fix disabling of occlusion culling from menu 2013-08-15 15:32:44 -07:00
Stephen Birarda
b288cc43a2 fix disabling of delta sending and low res while moving 2013-08-15 15:29:05 -07:00
Stephen Birarda
c930d058b1 fix monochrome option menu hook 2013-08-15 15:23:26 -07:00
ZappoMan
8e2fcffd5c enabled Low Res sending while moving by default 2013-08-10 11:58:25 -07:00
ZappoMan
7e5f03a36f Merge pull request #832 from birarda/assignee 
tweaks to assignment server and AvatarData for assignment to iOS
 2013-08-08 12:13:07 -07:00
Stephen Birarda
94d270b3d5 remove equals at beginning of AvatarData 2013-08-08 11:21:39 -07:00
Eric Johnston
52b33cb466 Rave tweaks: Improvements to finger trails and hand rendering 2013-08-07 16:19:54 -07:00
Stephen Birarda
72b53ea089 add Q_PROPERTY for handPosition 2013-08-07 10:41:32 -07:00
Stephen Birarda
c0793146bd Avatar instance in JS should be referenced as Avatar 2013-08-07 10:41:17 -07:00
Stephen Birarda
955b7f0d24 Merge branch 'master' of github.com:worklist/hifi into assignee 2013-08-07 10:26:26 -07:00
Eric Johnston
2e5dade413 Rave demo changes per Ryan's request: Darken the world when you're in rave mode, but leave the avatars and effects un-darkened. 
Also fixed a warning in AvatarData.cpp initialization
 2013-08-06 14:29:30 -07:00
ZappoMan
c93ed450a2 Merge pull request #791 from Atlante45/stalking_indicator 
Stalking indicator
 2013-08-06 12:33:26 -07:00
Eric Johnston
ab31c3f82d Rave glove: Fix initialization issues and activate mode switch. 
Note that this change will have no effect until the Avatar Mixer gets it, because the mixer will continue to send "glove mode 0" until it receives this update.
 2013-08-06 11:59:58 -07:00
Stephen Birarda
d0330b0a28 include QVariantMap in AvatarData, map values to floats for glm::vec3 2013-08-06 11:56:54 -07:00
Stephen Birarda
b0783e4cce add Q_PROPERTY macro for position QVariantMap 2013-08-06 11:25:29 -07:00
atlante45
eb9f32b7cb Merge branch 'master' of https://github.com/worklist/hifi into stalking_indicator 2013-08-06 11:07:58 -07:00
atlante45
97239968a5 Corrected wrong argument in sizeof 2013-08-06 11:05:00 -07:00
Stephen Birarda
f3d6f1edd8 add Q_PROPERTY hooks for yaw, pitch, roll, chatMessage 2013-08-06 11:04:13 -07:00
atlante45
32c155ef71 Render a string to show who is following who 2013-08-06 10:53:10 -07:00
Eric Johnston
fc23eaa825 Fixed per github feedback. 
Also, to prevent a repeat of yesterday's crash trouble, disabled the mode switch, so that those working on the rave mode can enable it locally for testing.
 2013-08-06 10:28:31 -07:00
Eric Johnston
16aae5993a Rave glove fixes: removed double-stored glove mode members 
Uncommented glove mode switch, which now calls a non-crashing method.
Fixed overlapping method names for very different methods (setRaveGloveMode becomes activateNewRaveGloveMode).
 2013-08-06 07:33:18 -07:00
Stephen Birarda
d1aad8c387 fix sleep interval in Agent.cpp so it isn't 0 2013-08-05 17:39:23 -07:00
ZappoMan
cc8c92c4e0 Merge pull request #785 from machinelevel/dev4 
Disable hand receive logic to keep team from crashing while a bug is bei...
 2013-08-05 16:05:06 -07:00
Eric Johnston
39f9729acb Warning fix: virtual method needs virtual destructor 2013-08-05 16:03:17 -07:00
Eric Johnston
14e470133c More cleanup after crash tracing 2013-08-05 16:02:09 -07:00
Eric Johnston
858738a10a Root cause of crash isolated to setRaveGloveMode(), so some disabled code has been re-enabled 2013-08-05 15:56:49 -07:00
Eric Johnston
002a62d31e Disable hand receive logic to keep team from crashing while a bug is being tracked. 2013-08-05 15:46:12 -07:00
Jeffrey Ventrella
96b443ec5d Merge pull request #781 from machinelevel/dev4 
Rave glove demo: Network rave data
 2013-08-05 14:07:57 -07:00
Eric Johnston
a3a5c3d6d4 Rave glove demo: Network rave data 
Sending glove modes over the network, and fixed ghost-fingers-left-behind issue.
Issues addressed:
  https://basecamp.com/2151194/projects/2058851-avatar/todos/54607028-bug-phantom-leap
  https://basecamp.com/2151194/projects/2058851-avatar/todos/54633674-demo-make
 2013-08-05 13:25:05 -07:00
Andrzej Kapolka
2722cfa5ac Fix for GCC warning. #import? 2013-08-05 11:58:09 -07:00
Stephen Birarda
d51e0b59bd change DATA_SEND_INTERVAL_MSECS to DATA_SEND_INTERVAL_USECS 2013-08-05 10:30:56 -07:00
Stephen Birarda
cddbf85172 don't include AudioInjector in Agent class 2013-08-05 10:13:25 -07:00
Stephen Birarda
0120ac2d0f remove an extra debug 2013-08-05 10:09:00 -07:00
Stephen Birarda
8f876b91ae changes for stub pull request of assignee work 2013-08-05 10:06:50 -07:00
Stephen Birarda
a4ea0f035a resolve conflicts on merge with upstream master 2013-08-05 09:56:07 -07:00
Jeffrey Ventrella
c60acfad28 merge 2013-08-02 11:00:53 -07:00
Jeffrey Ventrella
6ebe33bb0b Merge remote-tracking branch 'upstream/master' into particles 2013-08-02 11:00:10 -07:00
Jeffrey Ventrella
8fc800acff some work on hands 2013-08-02 10:59:04 -07:00
Andrzej Kapolka
69cac69067 Go ahead and show the leap hand by default, but don't include the fingers if 
the palms are inactive (!)
 2013-08-01 18:56:14 -07:00
Andrzej Kapolka
c038e2c9ba Wrong array index here, and finger needs to be flagged as active so that the 
avatar mixer will encode it.
 2013-08-01 18:32:48 -07:00
Stephen Birarda
269e040263 Qt5 find package cleanup 2013-08-01 15:27:55 -07:00
Stephen Birarda
2b0cfe3c67 resolve conflicts on merge with upstream master 2013-08-01 14:33:23 -07:00
Jeffrey Ventrella
1df7026b26 merge? 2013-08-01 10:54:09 -07:00
Stephen Birarda
71ab8ae4f8 some necessary changes for AvatarData transmission 2013-08-01 10:07:10 -07:00
Jeffrey Ventrella
6c1cc911d5 Merge remote-tracking branch 'upstream/master' into particles 2013-07-31 15:12:54 -07:00
Jeffrey Ventrella
cecb908dc1 cleanup 2013-07-26 12:53:40 -07:00
Jeffrey Ventrella
9890cf72ce added keyboard mode switching for rave glove effects 2013-07-26 12:37:37 -07:00
Stephen Birarda
890d2e40ec more fleshing out of Agent class to interpret javascript 2013-07-24 16:58:44 -07:00
Stephen Birarda
f8e7e1de66 modifications to hook shared classes to iOS 2013-07-24 13:05:02 -07:00
Stephen Birarda
7134d13001 tweaks for iOS compatibility 2013-07-24 12:34:32 -07:00
Stephen Birarda
67912cc325 merge with birarda/qt5 and resolve conflicts 2013-07-24 12:14:31 -07:00
Stephen Birarda
9f2b2d09a9 changes to CMakeLists for Qt5 2013-07-24 11:29:12 -07:00
Stephen Birarda
a8afaea542 switch to new qt5 find module setup 2013-07-23 20:49:08 -07:00
Stephen Birarda
e4169665a9 changes to CMakeLists to up to qt5 2013-07-23 20:28:11 -07:00
Stephen Birarda
da0049933b rename Operative to Agent 2013-07-23 20:25:21 -07:00
Stephen Birarda
7a028aa43d cmake changes for update to qt5 2013-07-23 20:23:32 -07:00
Jeffrey Ventrella
fdebe166ba fixed it so both leap hands produce particles 2013-07-22 14:07:51 -07:00
Eric Johnston
6ceb48127a Small fix when no Leap connected. 2013-07-19 19:56:05 -07:00
Eric Johnston
b8cf4a9775 Rave glove: stabilization of Leap hands 2013-07-19 19:47:07 -07:00
Eric Johnston
262851346c Rave Glove Demo: Leap Rework (simplification and elimination of redundant data passing) 
This version matches fingers based on Leap serialized ID's, avoiding finger-replacement-crosstalk.
 2013-07-19 09:31:45 -07:00
Eric Johnston
cb6f542b9f First-pass finger motion trails 2013-07-17 17:00:23 -07:00
Eric Johnston
aa0cab2180 Code review issues addressed. 2013-07-17 16:09:24 -07:00
Eric Johnston
8ebf5fbd6b Rave & Leap: cleanup and move over to new hand/finger structures 2013-07-17 14:54:18 -07:00
Eric Johnston
46c5383d10 minor cleanup 2013-07-17 12:54:44 -07:00
Eric Johnston
f21d2a477d Rave Glove Demo: Restructuring palm and finger data structures 2013-07-17 08:29:50 -07:00
ZappoMan
d71400a42a Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-07-16 09:36:39 -07:00
Eric Johnston
0239341127 updated per feedback 2013-07-15 14:27:58 -07:00
Eric Johnston
c61966ebcd made Leap unit-conversion method public 2013-07-15 14:12:52 -07:00
atlante45
bf3c4fa1f8 Avatar resizing final commit 2013-07-15 12:04:24 -07:00
atlante45
280afed7f0 added scale in avatar packets eand slots to change it from the menu 2013-07-12 17:51:47 -07:00
Eric Johnston
58b50067ad Some Leap finger fixes, but also temporarily disable Leap data sending, due to a crash. 
Will resolve the crash before re-enabling.
 2013-07-11 16:06:31 -07:00
ZappoMan
c26e39764a Merge branch 'master' of https://github.com/worklist/hifi into occlusion_culling 2013-07-11 13:50:33 -07:00
ZappoMan
57ce20d3ce add support for Low Res sending while moving 2013-07-11 12:43:43 -07:00
Stephen Birarda
769205253f remove extra plus in AvatarData parseData 2013-07-11 12:27:48 -07:00
Stephen Birarda
fcb8865d2e resolve conflicts on merge with upstream master 2013-07-11 10:58:45 -07:00
ZappoMan
9aed3d3cc6 enable delta sending by default 2013-07-11 10:37:28 -07:00
ZappoMan
dc70675c22 removed obsolete ResIn mode 2013-07-10 19:04:28 -07:00
ZappoMan
17e70271ff make occlusion culling default 2013-07-10 17:21:51 -07:00
Stephen Birarda
81e6bccd08 use packet version helpers in parseData methods 2013-07-08 14:13:36 -07:00
Stephen Birarda
8a684244cc packet versioning for HEAD_DATA packets 2013-07-08 12:53:07 -07:00
Stephen Birarda
5062ae8965 rename PACKET_HEADER to PACKET_TYPE, fix DS packet versioning 2013-07-08 11:37:39 -07:00
Andrzej Kapolka
f9f2c66115 Merge branch 'master' of https://github.com/worklist/hifi into kinected 
Conflicts:
	interface/src/Application.cpp
	interface/src/Avatar.cpp
	interface/src/Avatar.h
	libraries/avatars/src/AvatarData.h
 2013-07-05 22:52:42 -07:00
Andrzej Kapolka
30f77975cf Trying to get the right rotations, send them on the wire. 2013-07-03 17:07:22 -07:00
Stephen Birarda
36c6912de8 your agents are now nodes 2013-07-03 10:35:09 -07:00
Andrzej Kapolka
e866c22518 Merge branch 'master' of https://github.com/worklist/hifi into kinected 
Conflicts:
	interface/src/Avatar.cpp
 2013-07-03 10:15:11 -07:00
Eric Johnston
5d59bcbec7 (changed per requests and re-merged) Two Leap-related crashes fixed, plus Leap improvements 
1. Fixed thread-crash at terminate() time by terminating the LeapManager properly
2. Fixed an intermittent thread-crash when Leap active by removing auto-connection between controller and listener
3. Added fingerRoot positions to display and data packet
4. Introduced a vec3-based convention so that more finger data may be added without causing trouble for old clients and servers
5. My avatar's fingers are different color from others
 2013-07-02 17:03:32 -07:00
Andrzej Kapolka
52e7ff9a68 Working on filling in missing joint data. 2013-07-02 14:51:27 -07:00
Eric Johnston
6c42922288 Minor bug fixes for networked Leap hands 2013-06-28 15:22:56 -07:00
Eric Johnston
0ff3554dd8 Networked Leap fingers 
- Simplified finger updates and storage
- added pack and unpack for the fingers
- not yet tested between multiple machines, but *should* be harmless and backward-packet-compatible
 2013-06-28 11:34:20 -07:00
Eric Johnston
1c797405da Hand rework in preparation for adding send/receive hand data 
- Added Hand.cpp, Hand.h, HandData.cpp, HandData.h, roughly matching the equivalent Head files
- Cleaned up Avatar by moving hand work into Hand files
- Added fixed-point data packing, for use in sending hand offsets
 2013-06-28 07:57:02 -07:00
ZappoMan
7fe6c0e3b3 added occlusion culling menu option 2013-06-18 09:34:12 -07:00
ZappoMan
15587f8b23 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-06-04 18:01:58 -07:00
ZappoMan
726a0cecf2 fixed build issue 2013-06-04 17:40:34 -07:00
ZappoMan
4f2af717f2 Fixed merge issue with new orientation vectors, migrated to common identity names 2013-06-04 17:27:40 -07:00
ZappoMan
a12353e112 hopefully fix unix build buster 2013-06-04 11:38:47 -07:00
ZappoMan
eef0636655 some cleanup 2013-06-03 21:53:06 -07:00
ZappoMan
510dfc7353 Merge branch 'master' of https://github.com/worklist/hifi into avatardata_optimization 2013-06-03 21:43:38 -07:00
ZappoMan
4c597a2736 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-06-03 21:35:39 -07:00
Andrzej Kapolka
3f6cf08b97 Removed remaining Orientation bits (and class itself), enforce limits on 
head yaw/pitch/roll.
 2013-05-30 15:15:12 -07:00
Andrzej Kapolka
021dce72be Moved direction vectors to AvatarData, made them align with OpenGL view space 
(to avoid the 180 degree rotations).
 2013-05-30 09:55:34 -07:00
ZappoMan
b3045ea681 working on handPosition optimizations 2013-05-28 16:11:07 -07:00
Stephen Birarda
9f2c0adec7 move audioLoudness to HeadData 2013-05-28 12:22:51 -07:00
ZappoMan
04f4e499e1 Optimize wire-format for AvatarData 
- moved HandState into semi-nibble in bitItems
- moved KeyState into semi-nibble in bitItems
- moved AudioLoudness into scaled float stored as byte
- overall savings - 5 bytes
 2013-05-27 14:18:10 -07:00
ZappoMan
ddf4d7c748 removed extra comment 2013-05-27 14:17:55 -07:00
ZappoMan
5d1ba857c5 Optimize View Frustum wire format. 
- Changed View frstum orientaton to be a quaternion
- Implemented packing formats for Orientation Quats, Ratios, and Clipping values
- Changed wire format for View Frustum details to be more efficient 28 bytes vs 64 bytes
 2013-05-27 14:17:34 -07:00
ZappoMan
06e98d2c43 Optimize wire-format for AvatarData 
- moved HandState into semi-nibble in bitItems
- moved KeyState into semi-nibble in bitItems
- moved AudioLoudness into scaled float stored as byte
- overall savings - 5 bytes
 2013-05-27 14:10:51 -07:00
ZappoMan
20917c37b8 removed extra comment 2013-05-27 09:59:53 -07:00
ZappoMan
12dc11fbfa Optimize View Frustum wire format. 
- Changed View frstum orientaton to be a quaternion
- Implemented packing formats for Orientation Quats, Ratios, and Clipping values
- Changed wire format for View Frustum details to be more efficient 28 bytes vs 64 bytes
 2013-05-27 09:56:35 -07:00
Stephen Birarda
65168e6aec add a yaw offset to the oculus so it can pull body 2013-05-24 15:23:25 -07:00
Stephen Birarda
59a6016f4b use a NULL default for owningAvatar to simplify constructors 2013-05-24 12:18:38 -07:00
Stephen Birarda
49b483ef53 maintain a pointer to owning avatar from HeadData 2013-05-24 12:17:48 -07:00
Stephen Birarda
36892da488 keep a pointer to owning agent in AgentData 2013-05-24 12:17:34 -07:00
Jeffrey Ventrella
82af516471 ya ya 2013-05-22 18:16:11 -07:00
Jeffrey Ventrella
b7613497eb fixed pitch yaw (not roll) 2013-05-22 18:14:18 -07:00
Stephen Birarda
4738fc888b return Avatar Head by reference so setters actually do something 2013-05-22 16:43:41 -07:00
Jeffrey Ventrella
f866f39ac4 cleanups 2013-05-22 15:51:25 -07:00
Jeffrey Ventrella
4940a6ae9a Merge remote-tracking branch 'upstream/master' 2013-05-22 15:51:03 -07:00
Andrzej Kapolka
c97b4f5e1d Fix the spacing, and while we're at it, change tabs to spaces. 2013-05-22 15:22:05 -07:00
Andrzej Kapolka
365bb10d6b More work on righting based on gravity vector. 2013-05-22 13:30:30 -07:00
Jeffrey Ventrella
3c3a3fc82e cleaning up look at code - Stephen helped find a transmission bug - fixed. 2013-05-22 13:12:11 -07:00
Jeffrey Ventrella
f7b101b4aa Merge remote-tracking branch 'upstream/master' 2013-05-22 11:43:12 -07:00
Philip Rosedale
8b65fcae75 Merge pull request #352 from tschw/master 
refactors logging, adds comments, and revises names & formatting in all submitted code
 2013-05-21 22:10:10 -07:00
Jeffrey Ventrella
e219cd8223 Merge remote-tracking branch 'upstream/master' 2013-05-21 17:44:45 -07:00
Jeffrey Ventrella
c32d621d5f improving lookat behavior 2013-05-21 17:38:17 -07:00
tosh
0261f50298 merge up 2013-05-21 23:13:03 +02:00
ZappoMan
9f23f846a9 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-21 12:47:46 -07:00
ZappoMan
e29bc9972f code cleanup 2013-05-21 11:34:31 -07:00
ZappoMan
3220f986d6 code cleanup 2013-05-21 11:33:32 -07:00
ZappoMan
4f9c7fed59 removed UI for want exists bits, defaults to true 2013-05-21 11:25:50 -07:00
tosh
bfaeb4a4d9 Merge branch 'master' of git://github.com/worklist/hifi 
Conflicts:
	libraries/avatars/src/AvatarData.cpp
 2013-05-21 18:46:20 +02:00
Stephen Birarda
d2b2d36fcf lazy allocation of HeadData in getBroadcastData 2013-05-20 17:31:33 -07:00
Stephen Birarda
564244ddd3 move _leanSideways and _leanForwards to HeadData 2013-05-20 17:13:40 -07:00
Stephen Birarda
28bab24e70 type squishes in AvatarData 2013-05-20 16:17:49 -07:00
Stephen Birarda
570dfba934 code review comments, cleanup Avatar constructor 2013-05-20 16:12:38 -07:00
tosh
a86b8a1d93 refactors logging 2013-05-21 01:00:10 +02:00
ZappoMan
e1c89aac87 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 2013-05-20 15:52:04 -07:00
ZappoMan
a53f84fcb9 latest hacking 2013-05-20 15:51:47 -07:00
Stephen Birarda
de84b7803f move _lookAtPosition to HeadData class 2013-05-20 15:51:40 -07:00
Stephen Birarda
257a1d1f2e move head rotations to new HeadData class to be used for transmission 2013-05-20 15:21:02 -07:00
Jeffrey Ventrella
44ef5d4bac fix 2013-05-20 14:37:09 -07:00
Jeffrey Ventrella
b42d093b4a Merge remote-tracking branch 'upstream/master' 2013-05-20 14:36:13 -07:00
ZappoMan
4298b922a2 Merge branch 'master' of https://github.com/worklist/hifi into voxel_animation 
Conflicts:
	libraries/avatars/src/AvatarData.cpp
 2013-05-20 13:55:01 -07:00
ZappoMan
e9caa40d9a added exists bits to avatar data 2013-05-20 13:54:02 -07:00
ZappoMan
321d1952d6 first cut at exists bits 2013-05-20 12:56:59 -07:00
Stephen Birarda
c5bba41385 resolve conflicts on merge with upstream master 2013-05-20 12:49:49 -07:00
ZappoMan
cf065a413c merge 2013-05-20 12:36:16 -07:00
ZappoMan
24b34b19b1 merge 2013-05-20 12:35:18 -07:00
ZappoMan
17c961f1b0 merge 2013-05-20 12:34:15 -07:00
ZappoMan
6cf8ec32a7 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	libraries/avatars/src/AvatarData.cpp
	libraries/avatars/src/AvatarData.h
 2013-05-20 12:31:35 -07:00
Stephen Birarda
d6ceca4f4b move constructor for AvatarData to implemenation file 2013-05-20 12:16:56 -07:00
ZappoMan
fe1f02beff moved constructor 2013-05-20 12:16:55 -07:00
Jeffrey Ventrella
545b928971 Merge remote-tracking branch 'upstream/master' 2013-05-20 12:16:40 -07:00
birarda
1e63bb8d20 Merge pull request #353 from ZappoMan/master 
fixed Philip's no animation problem
 2013-05-20 12:15:57 -07:00
ZappoMan
b06cc60665 moved constructor 2013-05-20 12:14:32 -07:00
Jeffrey Ventrella
a192a21ef0 added _lookatPosition to avatar Data 2013-05-20 12:08:58 -07:00
Jeffrey Ventrella
4e6b2f9c50 test 2013-05-20 11:55:55 -07:00
Jeffrey Ventrella
570d2e104a test 2013-05-20 11:53:42 -07:00
Jeffrey Ventrella
ffbc70814a preparing to add transmitted lookat position data 2013-05-20 11:41:21 -07:00
ZappoMan
06242a82c4 fixed Philip's no animation problem 2013-05-19 20:53:46 -07:00
Stephen Birarda
b7b39c2a6e have addOrUpdateAgent return a pointer to the agent instead of a bool 2013-05-17 14:03:15 -07:00
Stephen Birarda
fb2f36519d inline getters and setters in AvatarData 2013-05-17 12:19:19 -07:00
Stephen Birarda
199853711f disallow copying of AvatarData objects 2013-05-17 12:15:10 -07:00
Jeffrey Ventrella
ade5b7bec3 formatting changes 2013-05-17 09:52:19 -07:00
Jeffrey Ventrella
1c126e2525 resolved conflicts 2013-05-16 17:32:54 -07:00
Philip Rosedale
9f57787ece Fixed jerking on gravity, added mouse pitch, yaw behavior. 2013-05-16 17:05:45 -06:00
Philip Rosedale
84d18296d2 removed normalization of body yaw (need to fix springs before we do it) 2013-05-15 10:02:02 -07:00
Philip Rosedale
daaf86a634 restrict avatar body yaw to be between 0-360 2013-05-15 08:06:53 -07:00
Jeffrey Ventrella
a5e696b696 Merge remote-tracking branch 'upstream/master' 2013-05-14 17:31:03 -07:00
Jeffrey Ventrella
f53b49c496 working on lookat (eye contact) 2013-05-14 17:30:41 -07:00
ZappoMan
a1902e3dc9 Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization 2013-05-14 12:14:53 -07:00
ZappoMan
4e92f5d3d8 tweaks to delta sending 2013-05-14 12:11:32 -07:00
ZappoMan
d59a8143d7 added wantDelta, made want bools a bit mask 2013-05-14 11:08:59 -07:00
Philip Rosedale
ba0263a436 Fixed uninitialized audio loudness value 2013-05-13 19:26:46 -07:00
ZappoMan
b196227385 Added wantResIn and wantColor feature between client and server 
- Updated Voxel Server to support non-res-in version of voxel distribution
- Updated agent data to allow client to send desired res-in and color state
- added menu items to client debug menu to toggle wantResIn and wantColor
 2013-05-13 15:02:46 -07:00
Philip Rosedale
c0a54eca14 Added head lean to broadcast data packets, lean now being set from invensense accelerometers. 2013-05-09 15:03:19 -07:00
Jeffrey Ventrella
7a24c50063 put orientation back in avatar folder (this should be put in a more logical place at some point) - also did some work on avatar renderer 2013-05-08 19:22:21 -07:00
Jeffrey Ventrella
9e60c8a36e increased GRAVITY_SCALE to 10.0; tidied-up avatar code; moved Orientation class to shared folder 2013-05-08 08:59:29 -07:00
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
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
Jeffrey Ventrella
754856227d Merge pull request #69 from PhilipRosedale/master 
Added hand position to transmission
 2013-04-17 15:29:18 -07:00
Stephen Birarda
1a3df2be5f comment cleanup in AvatarData 2013-04-17 15:25:05 -07:00
Philip Rosedale
952cb2f2ae Added head _isMine variable, added hand position transmission! 2013-04-17 15:14:30 -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
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
Jeffrey Ventrella
53796d067f changed Ori constructor to include setIdentity 2013-04-17 11:11:05 -07:00
Jeffrey Ventrella
1fb8d0b268 consolidated some code in Head.cpp 2013-04-16 20:35:50 -07:00
Jeffrey Ventrella
e825764304 added instrumentation to Orientation class to test for normalized and orthogonal vectors 2013-04-16 19:53:48 -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
598bed3b55 include cstring and stdint in AvatarData UNIX build 2013-04-16 12:22:09 -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
Stephen Birarda
61cf17da73 update agent-mixer to use new AvatarData class 2013-04-15 18:19:01 -07:00
Stephen Birarda
a5a93443c6 re-work AvatarData to handle body position and rotation 2013-04-15 18:05:22 -07:00
Stephen Birarda
ed3f308a0e pass ROOT_DIR to IncludeGLM macro instead of MACRO_DIR, include glm for AM 2013-04-15 16:08:35 -07:00
Stephen Birarda
af1071b374 comments to AvatarData and avatar-mixer before pack/unpack refactor 2013-04-15 16:07:46 -07:00
Stephen Birarda
a4011934c6 move Orientation class to avatars library, constants to SharedUtil 2013-04-15 15:39:23 -07:00
Stephen Birarda
2dfe49a885 moved AvatarAgentData to AvatarData 2013-04-15 15:05:55 -07:00
Stephen Birarda
d0eed92699 add an avatars library and move AvatarAgentData there 2013-04-15 14:51:34 -07:00