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
2de86bfa92
Revert "allow the bad triangles to render"
...
This reverts commit b5d1ae1a36
.
2013-03-29 16:22:10 -07:00
Stephen Birarda
b5d1ae1a36
allow the bad triangles to render
2013-03-29 15:18:34 -07:00
Stephen Birarda
3186254a93
initial LOD drop off when moving back
2013-03-29 03:42:54 -07:00
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
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
f109916125
move the voxel tree back to origin
2013-03-28 15:30:14 -07:00
Stephen Birarda
1b3c15a701
Merge remote-tracking branch 'origin/master'
2013-03-28 14:39:59 -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
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
c8190b95aa
remove un-needed AgentList include from VoxelSystem
2013-03-25 16:23:42 -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
Stephen Birarda
6712d23cd1
push and pop the matrix for voxel system draw
2013-03-21 17:12:50 -07:00
Stephen Birarda
5f052d7c9e
scale back heads after voxel system draw
2013-03-21 17:03:52 -07:00
Stephen Birarda
f97932353b
fix conditional inclusion of voxel in vertices and color arrays
2013-03-20 16:28:28 -07:00
Stephen Birarda
1efbaef44b
only add voxel to be drawn if not transparent
2013-03-20 16:21:45 -07:00
Stephen Birarda
e8f84aee78
fix rendering bugs
2013-03-20 15:32:12 -07:00
Stephen Birarda
634e9c4bf7
parse the bitstream tree and create an in memory representation to render
2013-03-20 13:25:11 -07:00
Stephen Birarda
92fc1ed1a6
receive bitstream from voxel server on client
2013-03-19 15:51:48 -07:00
Stephen Birarda
42fe3ce077
remove unused methods from VoxelSystem
2013-03-15 12:27:00 -07:00
Stephen Birarda
99e21be12c
include cstring for memcpy
2013-03-13 13:29:39 -07:00
Stephen Birarda
012b4a92fd
add a missing glBindBuffer that caused client to crash on voxel drawing
2013-03-13 11:58:58 -07:00
Philip Rosedale
5c1bd68580
Merge remote-tracking branch 'origin/master'
2013-03-08 16:00:17 -08:00
Philip Rosedale
f014fcd0ac
transmitter tweaks
2013-03-08 15:58:49 -08:00
Stephen Birarda
686404be2b
add a voxel server
2013-03-08 14:32:06 -08:00
Philip Rosedale
26fd44f030
100,000 voxel death star with concentric shells
2013-03-06 16:58:38 -08:00
Stephen Birarda
f004479e39
bump up to 300000 voxels, with color
2013-03-06 14:34:14 -08:00
Stephen Birarda
e16cd4ffc3
use vertex buffer objects to speed up voxel rendering
2013-03-06 13:56:11 -08:00
Stephen Birarda
0fbb534566
randomly draw 50000 voxels for glDrawElements test
2013-03-06 12:04:27 -08:00
Philip Rosedale
67115ccad4
First commit of 'Death Star' voxel planet
2013-02-21 11:25:52 -08:00
Philip Rosedale
5f60bf6376
recursive position vector is same as rendering.
2013-02-20 21:42:10 -08:00
Philip Rosedale
15fd9638d6
remove deadhead (of self) at origin. First commit of voxels with LOD, recursive test pattern.
2013-02-20 21:38:42 -08:00
Philip Rosedale
bd45740dc6
Partial progress on new voxel model.
2013-02-18 08:59:44 -08:00