Commit graph

181 commits

Author SHA1 Message Date
Jeffrey Ventrella
ab8140e0ef fixed a bug in avatar head lookat direction 2013-04-10 12:12:57 -07:00
ZappoMan
597f35db3d moved vector math helpers to Utils.cpp/h 2013-04-10 09:39:43 -07:00
ZappoMan
fc122f23d2 added first cut at view frustum debuging code 2013-04-10 01:32:01 -07:00
ZappoMan
e19b53a344 added key interface to toggle voxels 2013-04-10 00:46:04 -07:00
Philip Rosedale
e910bece1d temp commented groundPlaneGrid till file is fixed 2013-04-10 00:30:24 -07:00
Philip Rosedale
7edd93fd2c Merge remote-tracking branch 'origin' 2013-04-10 00:25:20 -07:00
Philip Rosedale
ef785ba7aa Improved comments at start of main.cpp, dropped unused octal.h,.cpp files, deleted many unused system variables and functions. 2013-04-10 00:25:03 -07:00
Jeffrey Ventrella
1b833fb4a9 added grid plane to aid in testing avatar navigation 2013-04-09 21:14:24 -07:00
Philip Rosedale
5a98ebfff2 Merge remote-tracking branch 'origin' 2013-04-09 17:13:01 -07:00
Philip Rosedale
760aafef8e Changed to render a small box of a fixed pixel width at screen center, useful for testing LOD Changes. 2013-04-09 17:12:43 -07:00
Jeffrey Ventrella
3dae70e665 removed glm::dvec3 and replaced with glm::vec3 in most of avatar code, except for velocity 2013-04-09 15:23:59 -07:00
Jeffrey Ventrella
09af8d153f added camera modes and also set initial avatar yaw to 90 2013-04-09 15:05:37 -07:00
ZappoMan
42e1355f1e add back voxels.render() call 2013-04-09 14:11:55 -07:00
Jeffrey Ventrella
e90dd52da4 resolve merge conflicts with origin/master 2013-04-09 13:30:26 -07:00
Jeffrey Ventrella
87c26a39fb adding more changes and small improvements to camera, and head... 2013-04-09 12:54:59 -07:00
ZappoMan
2ec3f6b210 Adding new AgentTypes.h and moving over to new constants 2013-04-09 10:37:07 -07:00
Philip Rosedale
60dc43041f added rendering lines between avatar bones 2013-04-08 22:42:45 -07:00
Philip Rosedale
87fd0f7a91 Fixed avatar lighting, head scaling, removed some extra log messages 2013-04-08 21:13:20 -07:00
ZappoMan
7480283dd4 cleanup of packet header constants 2013-04-08 19:54:14 -07:00
Jeffrey Ventrella
191ee71dbb Merge remote-tracking branch 'origin' 2013-04-08 18:46:28 -07:00
Jeffrey Ventrella
cd1533dc7c Lots of small changes in the head (evolving into "avatar") to include skeleton. Also, added camera behaviors for navigation 2013-04-08 18:46:00 -07:00
Stephen Birarda
69fa462151 don't steal ping replies from AgentList 2013-04-08 18:10:20 -07:00
ZappoMan
53cfd0ecdd adding CounterStats class and support for showing running average stats on voxels recieved, created, and colored in client 2013-04-08 17:03:22 -07:00
ZappoMan
23429441ac Merge branch 'master' of https://github.com/worklist/hifi 2013-04-08 11:18:51 -07:00
ZappoMan
aee27bfc16 Hmmm, when painting, X and Z are not flipped? I'm totally confused, but now
but LOD and painting seems to work.
2013-04-08 11:18:07 -07:00
Philip Rosedale
dbd9688f1f Turned off default for star field rendering until we find/fix the rendering bug 2013-04-08 09:34:19 -07:00
ZappoMan
aa40fd96d4 added -/% to menu text 2013-04-07 12:49:15 -07:00
ZappoMan
d3fd5d1a75 added keyboard commands for erase all and add scene 2013-04-07 12:45:46 -07:00
ZappoMan
5415543dcd adding Z command to voxel server and interface, Z command allows sending "erase all" and "add scene" commands 2013-04-06 12:03:46 -07:00
Jeffrey Ventrella
87fe21f835 got a basic avatar skeleton with a simpler starter user interaction for moving the right hand 2013-04-05 16:21:13 -07:00
Jeffrey Ventrella
a0f09b597a got a basic avatar skeleton with a simpler starter user interaction for moving the right hand 2013-04-05 16:19:23 -07:00
ZappoMan
16ad4fc220 hack to always send voxels to client (even if already visited), added paint mode features to client 2013-04-05 10:54:39 -07:00
Jeffrey Ventrella
5b2d1ec198 thingy3 2013-04-05 10:52:10 -07:00
Jeffrey Ventrella
e57e2bdf38 thingy2 2013-04-05 10:48:08 -07:00
ZappoMan
57829785eb fix to LOD bug caused by flip-flopped X and Z, add color randomization to inserted voxels on server, added head position display to display_stats() 2013-04-04 20:50:51 -07:00
Jeffrey Ventrella
d3f6c19e83 adding Camera and some utility classes and start of prototype avatar 2013-04-04 18:04:32 -07:00
tosh
de4734d6fb tightens ogl state handling (also fixes unreadably thick text for stats display) 2013-04-04 10:59:57 +02:00
ZappoMan
f859d8ed9c Added PaintMode, toggle for stars, etc. 2013-04-03 22:42:02 -07:00
Stephen Birarda
66a2b1a86f move stars.txt to S3 bucket 2013-04-03 15:24:26 -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
9220ba3ee5 Added agentTypes to AgentList::broadcastToAgents()
Make voxel server rebroadcast "remove voxel" messages to all it's connected heads
Cleaned up processing of Remove voxel messages to live in VoxelTree
2013-04-03 12:42:24 -07:00
ZappoMan
ad0b2f024b Fixed a couple of complier warnings, and added a new PerfStat class for monitoring runtime performance 2013-03-31 20:43:23 -07:00
tosh
8f458b0bea changes case/naming to agreed conventions 2013-03-29 13:41:33 +01:00
Stephen Birarda
3186254a93 initial LOD drop off when moving back 2013-03-29 03:42:54 -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
tosh
df7f3942e1 straightens data pipeline and several bugs after exhaustive testing 2013-03-29 01:08:24 +01:00
ZappoMan
ebceaf06dc added --domain command line option to interface 2013-03-28 15:22:10 -07:00
ZappoMan
6ec9949098 Add --local support to interface command line 2013-03-28 14:03:16 -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
Philip Rosedale
c0cb88e21b Added keyboard controls for smooth rotation, more junk removed from main.cpp 2013-03-27 15:54:54 -07:00