Commit graph

21 commits

Author SHA1 Message Date
Stephen Birarda
67efc12e59 move shared to libraries, DRY library macro, rename libs 2013-04-12 12:38:34 -07:00
vincent
d6189694c8 #19171 move of usleep function to SharedUtil.cpp 2013-04-10 21:55:29 +02:00
ZappoMan
f859d8ed9c Added PaintMode, toggle for stars, etc. 2013-04-03 22:42:02 -07:00
tosh
2341af271b Merge branch 'master' of git://github.com/worklist/hifi into 19188
Conflicts:
	interface/CMakeLists.txt
	interface/src/main.cpp
	shared/src/SharedUtil.cpp
	shared/src/SharedUtil.h
	shared/src/VoxelTree.cpp
2013-04-03 22:44:22 +02: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
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
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
eb185f2ce8 remove command options methods from SharedUtil that crash Jenkins 2013-03-25 16:37:24 -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
tosh
2c40673e04 fixes #includes 2013-03-24 14:04:08 +01: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
Stephen Birarda
95926cb7fc conditional chdir for OS X resources, revert windows Head changes 2013-03-21 17:02:41 -07:00
Stephen Birarda
1abce28310 use int instead of forced 8-bit types where appropriate 2013-03-20 13:44:09 -07:00
Stephen Birarda
9ac664dbab include cstdio for uint8_t 2013-03-20 13:34:53 -07:00
Stephen Birarda
482e65c296 move randomBoolean and randomColorValue methods to SharedUtil 2013-03-19 15:49:12 -07:00
Stephen Birarda
8ef885aaaf remove extra tokens after endif for WIN32 conditionals 2013-03-19 11:10:42 -07:00
Kees van Prooijen
cd27c74a2d prelimanary changes for windows port 2013-03-19 11:01:08 -07:00
Stephen Birarda
2f7767bc9b add helper method to SharedUtil to print bits in char 2013-03-15 12:25:13 -07:00
Stephen Birarda
686404be2b add a voxel server 2013-03-08 14:32:06 -08:00
Stephen Birarda
5d2cba0b2a add silent agent removal to AgentList class 2013-02-22 13:38:33 -08:00