Commit graph

955 commits

Author SHA1 Message Date
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
ZappoMan
12e06135bb fixed reaverageVoxelColors() behavior. seems to work better now 2013-04-05 13:18:06 -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
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
birarda
b017f9a454 Merge pull request #18 from tschw/19188
19188
2013-04-04 18:24:45 -07:00
tosh
31262340d4 adjusts formatting to agreed conventions 2013-04-05 01:24:00 +02:00
tosh
284530f7d6 tightens memory use 2013-04-04 11:59:16 +02:00
tosh
de4734d6fb tightens ogl state handling (also fixes unreadably thick text for stats display) 2013-04-04 10:59:57 +02:00
tosh
9046e5e89c silences warning by using pointer to const as string parameter for 'drawtext'
(conversion of string literals to char* is deprecated)
2013-04-04 10:55:08 +02:00
tosh
7d479af9c7 adjusts braces to agreed conventions 2013-04-04 10:52:42 +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
Stephen Birarda
320fa9e5c8 link curl to shared library, not interface 2013-04-03 15:14:35 -07:00
birarda
412dcc3b87 Merge pull request #17 from tschw/19188
Code Review for Job #19188
2013-04-03 15:07:57 -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
tosh
0733f06143 adds cmake support for starfield subdirectory 2013-04-03 22:04:09 +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
407fa95195 more delete voxel debugging, call reaverage colors on root node 2013-04-03 11:14:00 -07:00
ZappoMan
8988796285 more voxel delete debugging, use memcmp() instead of == 2013-04-03 09:38:11 -07:00
ZappoMan
f9dc41011a added call to reaverageVoxelColors() after deleting a voxel 2013-04-03 09:23:22 -07:00
ZappoMan
da52b0b321 Merge branch 'master' of https://github.com/worklist/hifi 2013-04-03 09:10:21 -07:00
ZappoMan
8c9eff82b2 More delete voxel debugging 2013-04-03 09:09:51 -07:00
Stephen Birarda
aa17cc6edc link ALSA after PortAudio for UNIX build 2013-04-02 15:34:10 -07:00
Stephen Birarda
6005629d15 fix framework inclusions in CMakeLists after previous change 2013-04-02 15:27:46 -07:00
Stephen Birarda
b3abd0bdb5 Merge branch 'master' of github.com:worklist/hifi 2013-04-02 15:07:15 -07:00
Stephen Birarda
757aadf53e changes to CMakeLists to remove double links on OS X 2013-04-02 15:07:04 -07:00
ZappoMan
eda4657ba9 adding debugging to delete node from tree 2013-04-02 14:55:03 -07:00
ZappoMan
17427a9c4d adding some new tools 2013-04-02 14:43:33 -07:00
ZappoMan
804943e2fb Added deleteVoxelCodeFromTree() and 'R' command to voxel server
Also added extra optional parameter to nodeForOctalCode() to return the parent node on node lookup
2013-04-02 14:26:54 -07:00
ZappoMan
9851a9b0f5 added new spheres to the voxel server scene 2013-04-01 22:50:28 -07:00
Stephen Birarda
761daf684f don't NULL out buffer data, just draw less 2013-04-01 17:25:31 -07:00
Stephen Birarda
ec6b8d2016 bring MAX_VOXELS_PER_SYSTEM back down to 250k 2013-04-01 17:14:39 -07:00
Stephen Birarda
f38df5579b remove the VBO transfer frequency tests 2013-04-01 15:12:39 -07:00
Stephen Birarda
3135d50ca9 drop redraw frequency to 0.5s 2013-04-01 15:08:20 -07:00
Stephen Birarda
793ac841f2 only allow VBO re-transfer every 5 seconds for test 2013-04-01 14:08:42 -07:00
Stephen Birarda
ebe11151f4 use the source attenuation ratio when mixing 2013-04-01 13:05:51 -07:00
Stephen Birarda
a0c5dcb3ca correct number of leading bytes for addition of attenuation byte 2013-04-01 13:03:46 -07:00
Stephen Birarda
124fecf8c9 Revert "don't send or parse attenuation for now"
This reverts commit 1767f2b052.
2013-04-01 12:28:51 -07:00
tschw
baa0a6de12 comments out ++(C++) build settings, for now
in case it needs more than a clean rebuild to compile
the project on recent Xcode - will revisit when I can
ensure things build safely
2013-04-01 15:33:22 +03: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
ZappoMan
91cac33cec fixed typo (I think) 2013-03-29 19:50:19 -07:00
Stephen Birarda
2de86bfa92 Revert "allow the bad triangles to render"
This reverts commit b5d1ae1a36.
2013-03-29 16:22:10 -07:00
Stephen Birarda
4589ceefaf reduce frequency of packets from VS for easier processing 2013-03-29 16:19:43 -07:00
tosh
20e7837717 adds #define to disable starfield multithreading support based on C++11
turns it off by default, for now
2013-03-29 23:19:16 +01:00
Stephen Birarda
b5d1ae1a36 allow the bad triangles to render 2013-03-29 15:18:34 -07:00
tosh
51afe69864 fixes overload issue with 'std::hypot' with older gcc (Xcode 3.2) 2013-03-29 23:17:53 +01:00
tosh
3a55234436 also bumps standard library version for clang (untested) 2013-03-29 22:32:44 +01:00
tosh
02d5f6bc62 removes dead, misplaced and commented-out code 2013-03-29 21:28:23 +01:00
Stephen Birarda
e5a31bc174 Merge branch 'master' of github.com:worklist/hifi 2013-03-29 11:35:22 -07:00
Stephen Birarda
f0e457081b temporarily disable walking noises for demo 2013-03-29 11:34:58 -07:00