Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-19 12:24:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
87417 commits 25 branches 28 tags 1.2 GiB
Commit graph

35611 commits

Author SHA1 Message Date
ZappoMan
0dfa5d573a removed debug code 2013-04-26 09:22:26 -07:00
ZappoMan
99c0cbc7cd removed some debug code 2013-04-26 00:47:14 -07:00
ZappoMan
2ba24e1716 fixed a couple bugs in VoxelNodeBag 2013-04-26 00:46:29 -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
d6e27d8f2f thread safety in VoxelTree (aded mutex to prevent reads and adds/deletes at same time) 
also added VoxelNodeBag class to handle running out of room in the encode tree functions
 2013-04-25 23:45:34 -07:00
ZappoMan
3f158c0753 Added new version of compareOctalCodes() which actually compares octal codes 2013-04-25 23:42:35 -07:00
ZappoMan
c014abbe6c new VoxelNodeBag class which is used to store a collection of voxel node pointers 2013-04-25 23:41:07 -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
ZappoMan
899068e3a6 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-25 17:35:02 -07:00
ZappoMan
3c7c85a98c Added second cut at new bitstream writers 
- added encodeTreeBitstream() which is new version of bitstream encoder that handles
  only encoding nodes that are in view. Also handles detecting packet overflow with
  new technique
- added encodeTreeBitstreamRecursion() which is the private work horse function
- moved temporary code to searchAndEncodeMultiTreeBitstream() which is still not
  ready for prime time
 2013-04-25 17:31:32 -07:00
ZappoMan
667fe11694 added VoxelNode::printDebugDetails() 2013-04-25 17:29:56 -07:00
Stephen Birarda
69ea567f77 use class key for AgentListIterator friend in AgentList 2013-04-25 17:12:11 -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
cdb8b1b144 Merge remote-tracking branch 'upstream/master' into agentlist-array 2013-04-25 16:40:20 -07:00
Stephen Birarda
edc908b1cd AgentList type squishes across project 2013-04-25 16:25:49 -07:00
Stephen Birarda
81322d01e5 spacing fixes in AgentList 2013-04-25 16:19:33 -07:00
Stephen Birarda
507f39a052 fix readability of agent dereference 2013-04-25 16:14:38 -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
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
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
ef6593eb89 update audio-mixer to use new AgentList iterator 2013-04-25 15:21:56 -07:00
Stephen Birarda
ad530b4eb8 fix bug based on dynamic end of agentList iterator 2013-04-25 15:10:08 -07:00
Stephen Birarda
2850d74a84 add typedefs for stl iterator implementation 2013-04-25 14:48:07 -07:00
Andrzej Kapolka
675d06e4b9 More chat bits; basic functionality now working. 2013-04-25 14:03:31 -07:00
Stephen Birarda
836d286b75 initial transition from vector to multi-dimensional array in AgentList 2013-04-25 13:11:13 -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
ZappoMan
0bec7156aa Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-24 23:50:57 -07:00
ZappoMan
785ef88820 Code cleanup, change readBitstreamToTree() to support multiple trees, first cut at new loadBitstream() 
- some small tweaks to cod to match coding standard for pointers
- changed readBitstreamToTree() to handle multiple trees in a single packet
- first cut at new version of loadBitstream() which is currently not in use
 2013-04-24 23:47:38 -07:00
ZappoMan
0c692ca0c0 added isLeaf(), isInView(), and distanceToCamera() helper methods 2013-04-24 22:54:55 -07:00
ZappoMan
f449eafa63 added typedef for location enum 2013-04-24 22:53:34 -07:00
ZappoMan
bbdf97ccc4 added some helper functions for debugging and for improved voxel protocol 
- added outputBufferBits() which will output an entire buffer as debug bits/bytes
- tweak to outputBits() to allow caller to ask for NewLine or not
- added insertIntoSortedArrays() which keeps a set of arrays sorted by a key
 2013-04-24 22:50:40 -07:00
ZappoMan
4b726b7fba added compareOctalCodes() and support for null octal code in printOctalCode() 2013-04-24 22:49:09 -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
Philip Rosedale
6c986a1049 Merge pull request #127 from tschw/19188 
19188
 2013-04-24 16:53:04 -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
Stephen Birarda
a5ea1dca7e fix incorrect debugging of agent local and public addresses 2013-04-24 11:16:13 -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
428cb89895 Merge remote-tracking branch 'upstream/master' 2013-04-23 20:44:50 -07:00
Stephen Birarda
11986ca00f add IP address to DS information output 2013-04-23 15:58:06 -07:00
Stephen Birarda
3344016212 SOLO_AGENT_TYPES needs a defined size 2013-04-23 14:12:21 -07:00
Stephen Birarda
ceefda8ce1 add cstring for memset and memcpy 2013-04-23 14:09:09 -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
Stephen Birarda
620615599f fix the const for injectAudio 2013-04-23 14:01:19 -07:00
Stephen Birarda
ed5afb3537 add const to injectAudio method 2013-04-23 13:57:41 -07:00
Stephen Birarda
fd6fb60d24 fix pointer var declarations in AudioInjector class 2013-04-23 13:55:42 -07:00
Stephen Birarda
ddc74984b5 fix pointer var declarations, AudioInjector constructor in eve main 2013-04-23 13:52:25 -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
5556686875 Fixes from brad's review 2013-04-23 11:59:43 -07:00
Stephen Birarda
88fe04bcd1 hook up the injector to the new AudioInjector class 2013-04-23 11:48:01 -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
beee875e88 add a new AudioInjector class that can be leveraged from eve and injector 2013-04-23 10:46:05 -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
79d547e9d0 fix return of bytes read to push pointer forwards 2013-04-22 18:41:12 -07:00
birarda
7eee3404c7 Merge pull request #113 from birarda/avatar-from-mixer 
fix broken build from NULL interface client sockets
 2013-04-22 18:36:47 -07:00
Stephen Birarda
8201b963d1 fix crash for NULL agent sockets 2013-04-22 18:36:13 -07:00
ZappoMan
47bfceca31 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-22 18:08:27 -07:00
ZappoMan
b291b5d1f6 fixed bug in initialization of false color (actually true color) 2013-04-22 18:07:58 -07:00
Stephen Birarda
4956370d52 have parseData return the number of bytes consumed 2013-04-22 18:05:27 -07:00
Stephen Birarda
8a3135a084 Merge remote-tracking branch 'upstream/master' into avatar-from-mixer 2013-04-22 17:56:19 -07:00
Stephen Birarda
d895665d5f create missing agents sent from the avatar mixer 2013-04-22 17:55:48 -07:00
ZappoMan
9d17dc0387 make view frustum culling default behavior, removed soem debug printf()s for now 2013-04-22 17:43:28 -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
Stephen Birarda
ea5a247f93 view frustum additions means there are now 94 bytes per avatar 2013-04-22 16:22:06 -07:00
Stephen Birarda
7375932cc7 Merge remote-tracking branch 'upstream/master' 2013-04-22 16:17:54 -07:00
Stephen Birarda
2d8997003a include avatar ID on log output 2013-04-22 16:16:06 -07:00
ZappoMan
a79659a5d4 change VoxelAgentData to not include position, use AvatarData _bodyPosition instead 2013-04-22 15:22:41 -07:00
ZappoMan
7c73964836 code review cleanup 2013-04-22 15:07:46 -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
030f5328f5 First cut at View Frustum Culling between client and server 2013-04-22 14:46:25 -07:00
ZappoMan
e1da39e2bb Made several ViewFrustum methods const since they don't modify the class 2013-04-22 14:13:56 -07:00
ZappoMan
9b34427570 Added camera data to AvatarData class, and include it in interface 2013-04-22 14:12:08 -07:00
Stephen Birarda
a558597b6a complete an initial version of eve that sits at 0,0,0 2013-04-22 13:10:21 -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
ZappoMan
400ecf6b86 Convert over to standard glm functions for length, normalize, cross, and dot product 2013-04-21 22:57:01 -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
e93ece0f52 Added support for NO_FALSE_COLOR define. 
- changed VoxelNode to have implementation option for NO_FALSE_COLOR
Need some help from Stephen and/or Leo on how to make cmake support
building the voxels library in NO_FALSE_COLOR mode for the server
but keep false color support in the client
 2013-04-21 19:45:54 -07:00
ZappoMan
a02a75f516 fix bug in definition of frustum planes, and general code cleanup 
- Fixed bug in definition of frustum planes, namely making sure the points are
  given in the correct order so that our plane normals point in correct direction
- general code cleanup to match coding standard
 2013-04-21 15:21:03 -07:00
ZappoMan
8a150d27b8 Cleanup for coding standard fix bug in creation of plane from points 
- cleaned up code to match HiFi Coding standard
- fixed bug in creation of plane related to cross product
 2013-04-21 15:18:17 -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
7dbc6bc986 Added inline getters for camera attributes 2013-04-19 19:56:53 -07:00
ZappoMan
8ad51b6c08 got rid of a bunch of this-> at Stephen's request. Added debuging for box in view 2013-04-19 19:56:03 -07:00
ZappoMan
2752918573 Fixed LOD bug, added recurseTree helper, change tree to use safe/true/false colors 
- Fixed LOD bug in server side sending
- added recurseTreeWithOperation() helper
- changed tree to use new VoxelNode color related API
 2013-04-19 18:15:50 -07:00
ZappoMan
3ec920d1b8 added scale() method to AABox 2013-04-19 18:14:10 -07:00
ZappoMan
4085c94aa7 made a version of firstVertexForCode() that doesn't allocate memory, for improved performance and use 
- created new copyFirstVertexForCode(code,output) which copies to the output buffer
- converted firstVertexForCode() to behave same way as before, but use copy version
 2013-04-19 18:11:28 -07:00
ZappoMan
9c601cedd0 Adding support for false color to voxel nodes, also added AABox to get voxel bounding box 2013-04-19 18:05:38 -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
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
d937ef17f6 remove extra debug line 2013-04-18 16:38:46 -07:00
Stephen Birarda
6e540d166b add a decay to the event delta average 2013-04-18 16:30:38 -07:00
Stephen Birarda
cf1254f53b rename the _movingAverage variable so it is more descriptive 2013-04-18 15:45:20 -07:00
Stephen Birarda
d0e3a96485 Merge remote-tracking branch 'upstream/master' into mixer-stats 2013-04-18 15:33:57 -07:00
Stephen Birarda
588fc67cb9 add SimpleMovingAverage to each Agent, collect bytes received stats 2013-04-18 15:02:26 -07:00
Stephen Birarda
b9a1faf284 add a new SimpleMovingAverage class, replaces CounterStats 2013-04-18 14:46:39 -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
Stephen Birarda
b6b35f29e2 switch the Agent printLog back from hexadecimal notation 2013-04-18 10:46:10 -07:00
Philip Rosedale
a834c52b40 Quick attpemt to fix logging code 2013-04-18 07:48:57 -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
Philip Rosedale
b7346474d0 Merge pull request #71 from tschw/19188 
19188
 2013-04-17 22:15:39 -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
27adc1f84b Merge pull request #76 from birarda/master 
remove a debug line
 2013-04-17 17:43:55 -07:00
Stephen Birarda
24994f3561 remove extra debug line left over from mutex fixes 2013-04-17 17:43:30 -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
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
Jeffrey Ventrella
a44ff94f85 Merge remote-tracking branch 'upstream/master' 2013-04-17 12:50:41 -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
Stephen Birarda
e9592c45c7 fix reference to resources directory on OS X 2013-04-17 11:56:32 -07:00
Philip Rosedale
e558f45426 Merge pull request #63 from Ventrella/master 
fixed orientation contrstuctor
 2013-04-17 11:21:50 -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
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
4ddbbd6209 fixes misplaced include .h -> .cpp 2013-04-17 20:01:33 +02:00
Stephen Birarda
0768785cfd fix mutex movement when resizing AgentList vector 2013-04-17 11:01:08 -07:00
tosh
e55863a662 integrates logging for 'shared' library 2013-04-17 19:46:00 +02: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
ZappoMan
4422ade9ff Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-16 12:50:04 -07:00
Stephen Birarda
f8ab33ccc7 add missing packet header for broadcast head data 2013-04-16 12:48:47 -07:00
ZappoMan
4a28e5889b Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-16 12:39:58 -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
c921fd9b87 remove unnecessary SharedUtil include 2013-04-16 12:26:44 -07:00
Stephen Birarda
0182c29e7b switch Util for SharedUtil in ViewFrustum 2013-04-16 12:25:23 -07:00
Stephen Birarda
598bed3b55 include cstring and stdint in AvatarData UNIX build 2013-04-16 12:22:09 -07:00
Stephen Birarda
e7e7bd290a remove debugging on voxel deletion 2013-04-16 12:04:56 -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
ZappoMan
dcca1699d3 Adding first cut at ViewFrustum pointIn,SphereIn,BoxIn code. 
- Added Plane class
- Added AABox class
- Removed some experimental "slightly inside" code from view frustum
 2013-04-16 11:29:31 -07:00
ZappoMan
a3fabaf300 Merge pull request #50 from tschw/19188 
19188
 2013-04-16 08:25:07 -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
Stephen Birarda
861c8e76ee grab jeffrey's changes to Util consts 2013-04-15 18:35:46 -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
ZappoMan
3b994cbdcf Latest work on ViewFrustum 
- added support for specifying lens attributes (fov, near, far, ratio)
- changed constructor and calculate methods to be separate
- coding standard cleanup
 2013-04-15 17:54:44 -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
4702e6ade0 remove the unecessary trailing slash when setting root dir 2013-04-15 14:59:48 -07:00
Stephen Birarda
d0eed92699 add an avatars library and move AvatarAgentData there 2013-04-15 14:51:34 -07:00
Stephen Birarda
d094c6fc3b refactor LinkHifiLibrary, add SetupHifiLibrary macro 2013-04-15 14:41:59 -07:00
Stephen Birarda
24689e97ab fix packing and unpacking of agent IDs 2013-04-15 11:12:31 -07:00
ZappoMan
27165be902 tweak starting fov adjust to 1.65 which seems correct 2013-04-13 13:19:48 -07:00
ZappoMan
4cb986b3f9 tweaks to ViewFrustum's default FOV, added comments 2013-04-13 13:09:20 -07:00
ZappoMan
1264bdf63d Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-12 18:28:17 -07:00
ZappoMan
505b2db935 some spacing cleanup 2013-04-12 17:27:54 -07:00
Stephen Birarda
cb233e843c Merge branch 'master' of github.com:worklist/hifi into reorganize 2013-04-12 17:25:41 -07:00
ZappoMan
54ba0d0224 cleaned up spacing for code review 2013-04-12 17:23:23 -07:00
ZappoMan
ca4286590e fixed column width to match codeing standard 2013-04-12 17:14:08 -07:00
ZappoMan
5a8c5ff011 coding standards clean up 2013-04-12 16:55:57 -07:00
Stephen Birarda
787bebb5fc don't call constructor and assignment operator 2013-04-12 16:51:59 -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
Stephen Birarda
1415a25302 fix for warnings produced by CounterStats refactor 2013-04-12 16:22:35 -07:00
Stephen Birarda
cc2f35ca89 pass a ROOT_DIR to LinkHifiLibrary 2013-04-12 15:59:16 -07:00
ZappoMan
2ea8ce8ef8 Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-12 15:37:54 -07:00
Stephen Birarda
f6adac1399 change a couple more long ints 2013-04-12 15:35:06 -07:00
Stephen Birarda
d30512e273 remove another long int 2013-04-12 15:25:41 -07:00
Stephen Birarda
83ee450759 change long int to long in CounterStats 2013-04-12 15:18:04 -07:00
Stephen Birarda
9b73d2559d Revert "add dependency to shared library from voxel library" 
This reverts commit e9d71c9406.
 2013-04-12 15:15:19 -07:00
Stephen Birarda
e9d71c9406 add dependency to shared library from voxel library 2013-04-12 15:06:51 -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
Stephen Birarda
13cde69da2 include the shared headers to the voxel library 2013-04-12 15:03:02 -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
Stephen Birarda
c3b457febb moved MarkerNode from shared to voxel library 2013-04-12 14:51:12 -07:00
ZappoMan
862ee47fbb moving voxellib to libraries/voxels 2013-04-12 13:40:33 -07:00
ZappoMan
cf6b8fe72f Merge branch 'master' of https://github.com/worklist/hifi into view_frustum_work 2013-04-12 13:37:34 -07:00
Stephen Birarda
b0ff960e37 use MACRO_DIR variable to find glm in root externals dir 2013-04-12 13:20:46 -07:00
Stephen Birarda
c2cb7cf397 rename MACRO_DIRECTORY variable to MACRO_DIR in voxels lib 2013-04-12 13:13:58 -07:00
Stephen Birarda
31f3f0c31c add a MACRO_DIRECTORY variable to voxels CMakeLists 2013-04-12 13:09:22 -07:00
Stephen Birarda
67efc12e59 move shared to libraries, DRY library macro, rename libs 2013-04-12 12:38:34 -07:00