Commit graph

814 commits

Author SHA1 Message Date
Stephen Birarda
d2a8da890f don't make the eye sphere a global object 2013-03-28 11:36:41 -07:00
Stephen Birarda
846ba80c10 get VS back to a point where it talks to client 2013-03-28 11:28:17 -07:00
Stephen Birarda
0820900365 fix incorrect name for member variable in MarkerNode 2013-03-27 18:51:11 -07:00
Philip Rosedale
0b044d01d5 always be making random left/right/mouth eye contact 2013-03-27 16:00:40 -07:00
Philip Rosedale
c3bc43f48e Merge remote-tracking branch 'origin' 2013-03-27 15:55:13 -07:00
Philip Rosedale
c0cb88e21b Added keyboard controls for smooth rotation, more junk removed from main.cpp 2013-03-27 15:54:54 -07:00
Stephen Birarda
17904ee069 remove .mm include for interface now that menu is gone 2013-03-27 11:29:13 -07:00
Philip Rosedale
ef9c704bb1 Merge remote-tracking branch 'origin' 2013-03-26 17:33:21 -07:00
Philip Rosedale
642b64dfd6 First commit to improve avatar movement 2013-03-26 17:32:54 -07:00
Stephen Birarda
7c1470c07e remove debug send to 10.0.0.10 2013-03-26 16:22:42 -07:00
Stephen Birarda
bbb0e9cea3 move MarkerNode to shared to hook with VoxelTree 2013-03-26 14:10:06 -07:00
Stephen Birarda
a6333122e6 build out MarkerNode class 2013-03-26 14:07:35 -07:00
Stephen Birarda
1c9d4de0d6 hook up VoxelAgentData to new MarkerNode class 2013-03-26 14:06:52 -07:00
Stephen Birarda
761db13e90 add the MarkerNode class to maintain markers during tree traversal 2013-03-26 14:06:34 -07:00
Stephen Birarda
5bd398931f remove voxel sending from voxel main loop 2013-03-26 12:47:21 -07:00
Philip Rosedale
53cff16c9a Merge remote-tracking branch 'origin' 2013-03-26 11:54:34 -07:00
Philip Rosedale
e0ee6c269a Added thrust and velocity to avatar head, first part of movement improvements 2013-03-26 11:53:57 -07:00
Stephen Birarda
3fe8c0643c remove hardcoded DOMAIN_IP from AgentList 2013-03-26 11:00:57 -07:00
Stephen Birarda
bb14a90f86 remove constants re-added on merge 2013-03-25 23:00:36 -07:00
ZappoMan
08413cfc3d fixed build issue 2013-03-25 22:57:15 -07:00
ZappoMan
23c6a9017c Merge branch 'master' of https://github.com/worklist/hifi
Conflicts:
	interface/src/main.cpp
	shared/src/SharedUtil.cpp
	shared/src/SharedUtil.h
2013-03-25 22:51:59 -07:00
ZappoMan
2f6b2466ea Fixed getCommandOption and cmOptionExists to be more porable
added support for --NoConnect command line option to test running without connecting
added pruneTree to VoxelTree
2013-03-25 22:39:24 -07:00
Stephen Birarda
9dbb64aaec have mixer and voxel server also maintain agent IDs 2013-03-25 16:54:36 -07:00
Stephen Birarda
d76fafda67 remove call that included getCmdOption 2013-03-25 16:45:49 -07:00
Stephen Birarda
a2b05d5f14 include stdlib for use of atoi 2013-03-25 16:43:31 -07:00
Stephen Birarda
3df93804d1 include cstring for memcpy in AgentList 2013-03-25 16:41:42 -07:00
Stephen Birarda
1e2876ce75 include stdint for use of uint16_t 2013-03-25 16:40:19 -07:00
Stephen Birarda
eb185f2ce8 remove command options methods from SharedUtil that crash Jenkins 2013-03-25 16:37:24 -07:00
Stephen Birarda
9eac649268 merge Leo's ID additions to DS 2013-03-25 16:27:25 -07:00
Stephen Birarda
507b6e0064 use abstracted DS check in method from AgentList 2013-03-25 16:24:14 -07:00
Stephen Birarda
c8190b95aa remove un-needed AgentList include from VoxelSystem 2013-03-25 16:23:42 -07:00
Stephen Birarda
3ca5263582 abstract check in with DS to AgentList 2013-03-25 16:23:13 -07:00
Leonardo Murillo
61e41f1603 Merge pull request #15 from murillodigital/injector
Stream injector - including attenuation modifier byte in header
2013-03-25 16:01:55 -07:00
Leonardo Murillo
0917cafd4e Using shared utils and changing modifier data type 2013-03-25 16:25:25 -06:00
Leonardo Murillo
957dde317f Merge branch 'master' of github.com:/worklist/hifi into injector 2013-03-25 16:24:25 -06:00
Leonardo Murillo
88b899efb7 Merge pull request #14 from murillodigital/19179
Add unique id to agents and broadcast back
2013-03-25 15:19:37 -07:00
Leonardo Murillo
63589985f4 Removing unneeded memcpy 2013-03-25 16:12:51 -06:00
Leonardo Murillo
cb84b7573b Getting rid of unused declaration 2013-03-25 15:56:22 -06:00
Leonardo Murillo
54a946ee80 Splitting line, adding agentId to copy constructor and swap 2013-03-25 15:54:08 -06:00
Leonardo Murillo
fc382997bd Merge branch 'master' of github.com:/worklist/hifi into 19179 2013-03-25 15:13:39 -06:00
Stephen Birarda
896047d2aa have the mixer additionally attenuate sources based on extra byte 2013-03-25 12:05:32 -07:00
ZappoMan
0711539fc6 Changed colors of spheres to be a gradient along phi between to random colors
this gives the spheres a little bit more natural look.
Also increased the level of detail (smaller voxels)
2013-03-24 13:00:23 -07:00
ZappoMan
ef8694dd60 1) Added createSphere() to VoxelSystem to create a sphere
2) Added pointToVoxel() to SharedUtils, this will give you a voxel code
   given x,y,z,s,r,g,b
3) Added '.' keyboard interface to create a random sphere in the local
   voxel system
2013-03-24 10:06:43 -07:00
ZappoMan
8ecc0d53ad Added a utility to VoxelSystem for loading voxels from a local file
Also added a couple shared utility functions for reading command
line options (since that's how you can load a local file at this
point).
2013-03-23 21:59:27 -07:00
Leonardo Murillo
0ab62b7493 Stream injector 2013-03-22 20:42:56 -06:00
Stephen Birarda
c9e16994f4 fix printTreeForDebugging instead of addition of repairChildMasks 2013-03-22 18:26:05 -07:00
Stephen Birarda
f435a09673 add method to repair child masks after adding randomly placed voxels 2013-03-22 18:19:37 -07:00
Stephen Birarda
c641f12693 some refactoring in for readCodeColorBufferToTree 2013-03-22 17:59:54 -07:00
Leonardo Murillo
bd18aeefe4 Couple of quick changes 2013-03-22 17:39:07 -06:00
Stephen Birarda
c51b4e3311 add leavesWrittenToBitstream member variable to VoxelTree for debug 2013-03-22 16:21:45 -07:00