Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-04-14 00:26:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
889 commits 22 branches 28 tags 1.2 GiB
Commit graph

889 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
80170bd4c4 don't do gross things if data is being written while GPU is copying it 2013-03-29 03:12:11 -07:00
Stephen Birarda
b50f10fde4 Merge branch 'master' of github.com:worklist/hifi 2013-03-29 02:46:33 -07:00
Stephen Birarda
0a9183e05b small change to render levels 2013-03-29 02:46:22 -07:00
ZappoMan
00787a31d6 Added VoxelNode::collapseIdenticalLeaves() 
Fixed small bug in setColorFromAverageOfChildren()
Changed sphere color randomization to be more dramatic
 2013-03-28 23:38:34 -07:00
ZappoMan
270f77799d added random color options, cleaned up compiler warnings, add reAverageParentColors when modifying voxel tree 2013-03-28 17:21:47 -07:00
Stephen Birarda
f85abe53ef add a method to VoxelTree to reaverage the voxel colors 2013-03-28 16:22:37 -07:00
Stephen Birarda
a7f74a9f40 Merge branch 'master' of github.com:worklist/hifi 2013-03-28 15:30:40 -07:00
Stephen Birarda
f109916125 move the voxel tree back to origin 2013-03-28 15:30:14 -07:00
Stephen Birarda
eec16a8eb5 recreate the MarkerNode tree on agent copy 2013-03-28 15:28:55 -07:00
ZappoMan
ebceaf06dc added --domain command line option to interface 2013-03-28 15:22:10 -07:00
Stephen Birarda
3ead1a5827 merge with brad's sphere/load file changes 2013-03-28 14:46:44 -07:00
Stephen Birarda
1b3c15a701 Merge remote-tracking branch 'origin/master' 2013-03-28 14:39:59 -07:00
Stephen Birarda
6d8ff8cc05 use a thread to distribute voxels to clients on a clock 2013-03-28 14:36:21 -07:00
Stephen Birarda
287775e0f9 change the loadBitstreamBuffer method to accommodate absence of childMask variable 2013-03-28 14:35:45 -07:00
Stephen Birarda
9cd314d3c4 move the voxel system to 40,0,40, only re-render on new voxels 2013-03-28 14:35:02 -07:00
Stephen Birarda
1f98929503 remove the childMask member variable VoxelNode 2013-03-28 14:34:10 -07:00
Stephen Birarda
f469ec8e2e remove the notion of last sent level from VoxelAgentData 2013-03-28 14:33:26 -07:00
Stephen Birarda
0fb244c2bd don't delete an agent if the data is concurrently being used 2013-03-28 14:33:04 -07:00
ZappoMan
055c46c60f add spheres from command line 2013-03-28 14:32:53 -07:00
Stephen Birarda
de3f5edd69 add a mutex to the agent so we don't delete it when using it 2013-03-28 14:32:20 -07:00
ZappoMan
6ec9949098 Add --local support to interface command line 2013-03-28 14:03:16 -07:00
ZappoMan
ed6195f3a0 Merge branch 'master' of https://github.com/worklist/hifi 2013-03-28 14:00:58 -07:00
ZappoMan
fe8b6f7d63 * Moved load file and create sphere from VoxelSystem to VoxelTree 
* Added --local command line support to domain and voxel servers so that
  you can run them locally without recompiling.
* made command line option parsing more cross platform
* added --NoColorRandomizer to interface when loading local models
* added -i file load support to voxel server to load in a preexisting model at launch
* added --NoRandomVoxelSheet to voxel server to NOT create the built in voxel sheet
* added first cut at 'I' command from clients to voxel server to insert voxels into voxel tree
* changed ambient light settings in interface to not be so aggressive
* added randInIntRange() helper to SharedUtils
* tweat to pruneTree() to also repair child mask
* some coding standard refactoring
 2013-03-28 13:54:28 -07:00
Stephen Birarda
a41b003582 perform proper verification for creation of new sphere 2013-03-28 11:47:23 -07:00
Stephen Birarda
084b77be50 NULL sphere pointer on Head copy 2013-03-28 11:37:49 -07:00
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