tosh
e03bbec6fc
adds optional shaders to vary the point size based on the brightness
2013-03-29 19:04:47 +01:00
tosh
002d607e9f
adds component to ease use of OpenGL programs (that is pipelines of shaders)
2013-03-29 19:03:28 +01:00
Stephen Birarda
3be5d60fc4
comment out threshold frames to hopefully reduce clicks
2013-03-29 09:17:33 -07:00
Stephen Birarda
1767f2b052
don't send or parse attenuation for now
2013-03-29 08:36:33 -07:00
tosh
8f458b0bea
changes case/naming to agreed conventions
2013-03-29 13:41:33 +01:00
tosh
bdf358b0fb
removes some leftover debug code
2013-03-29 13:39:46 +01:00
tosh
1eb904ca59
also changes case/naming to agreed conventions in the utility components
2013-03-29 11:54:09 +01:00
tosh
2d997a9a8d
inserts synchronization primitives
2013-03-29 11:43:04 +01: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
tosh
2b3263e019
splits up Stars.cpp into a module of multiple files
2013-03-29 10:53:30 +01:00
tosh
8300646b33
allows new C++ standard features
2013-03-29 10:42:36 +01:00
tosh
b4f2b04241
allows qualified inclusion in subdirectories
2013-03-29 10:24:14 +01: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
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
ZappoMan
ebceaf06dc
added --domain command line option to interface
2013-03-28 15:22:10 -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
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
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
tosh
06fc3ce00c
adjusts the north-south meridian
2013-03-27 17:12:33 +01:00
tosh
56d802cd57
updates to a whole sphere of stars with meridians and equator
2013-03-27 17:06:36 +01:00
tosh
891194ed2e
adds meridians with color gradient and an equator
2013-03-27 17:05:23 +01:00
tosh
0a6cdf9da5
bumps the default limit to 200K stars
2013-03-27 15:53:30 +01:00
tosh
8e0fe23ad6
straightens range issues (crucial for higher numbers of stars),
...
moves compile time options to top of file,
enables setLOD (test pending), and
adds some debug logging (commented-out)
2013-03-27 15:51:22 +01:00
tosh
704ae4acb2
removes default limit loading stars
2013-03-27 15:50:25 +01:00
tosh
eac8c99ee1
changes default to generate a full sphere
2013-03-27 15:46:54 +01:00
tosh
24d0f3a0a0
adds stars file in the right location so everything runs out of the box
2013-03-27 13:49:52 +01:00
tosh
5350de1c76
makes things run and build on OSX and fixes missing initialization in loader
2013-03-27 13:38:06 +01:00
tosh
ecd64d3244
improves naming consistency (mostly member variable prefixes)
2013-03-27 11:49:43 +01:00
tosh
fcec7bf62f
fixes broken debug code
2013-03-27 07:10:43 +01:00
tosh
ecddf9aa76
fault tolerance when 'render' is called prior to loading
2013-03-27 06:55:41 +01:00
tosh
68a62cf8c6
implements FOV culling, most properly
2013-03-27 03:30:51 +01:00
tosh
1327b8852b
adds getAspectRatio function
2013-03-27 03:30:25 +01:00
tosh
8a1fd43437
implements a more uniform distribution of star positions and a progress bar
2013-03-27 03:28:48 +01: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
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
bb14a90f86
remove constants re-added on merge
2013-03-25 23:00:36 -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
d76fafda67
remove call that included getCmdOption
2013-03-25 16:45:49 -07:00
Stephen Birarda
507b6e0064
use abstracted DS check in method from AgentList
2013-03-25 16:24:14 -07:00
Stephen Birarda
c8190b95aa
remove un-needed AgentList include from VoxelSystem
2013-03-25 16:23:42 -07:00
Stephen Birarda
896047d2aa
have the mixer additionally attenuate sources based on extra byte
2013-03-25 12:05:32 -07:00
tosh
a8df635c09
adds hack to consider "forgotten" tiles.
...
a proper solution (that will also consider screen dimensions / roll) is still pending
2013-03-25 12:14:12 +01:00
tosh
5475c64ff3
reworks tile selection, 1st step (2nd pending)
2013-03-25 10:51:31 +01:00
tosh
7d32eeb20a
adjusts to function renaming in FieldOfView
2013-03-25 10:50:45 +01:00
tosh
721f4fd3b4
tidies viewing - looks much better already. tile selection is still too naive (or not naive enough)
2013-03-25 02:49:31 +01:00
tosh
6a9134d4a5
exposes function to fetch glFrustum arguments
2013-03-25 02:47:24 +01: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
tosh
e965b88c88
implements live LOD and input limit
2013-03-24 14:06:43 +01:00
tosh
5de3ec035b
leftover changes / minor corrections
2013-03-24 06:30:33 +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
tosh
4444bcf26e
starfield and numerous utility components, initial checkin
2013-03-24 05:50:07 +01:00
Stephen Birarda
61f23a2d0f
add a new walk sound
2013-03-22 14:06:20 -07:00
Stephen Birarda
6346a14cb5
remove voxelServerAddCallback
2013-03-22 10:48:41 -07:00
Stephen Birarda
3fa0439f29
add method to SharedUtil to chdir to OS X bundle resources
2013-03-22 10:35:55 -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
95926cb7fc
conditional chdir for OS X resources, revert windows Head changes
2013-03-21 17:02:41 -07:00
Stephen Birarda
e2a28b48db
revert Head.cpp to earlier commit to confirm source of direction changes
2013-03-21 16:51:45 -07:00
Stephen Birarda
d61ae179ae
hide the cloud again
2013-03-21 16:16:25 -07:00
Stephen Birarda
0b48eab1fb
Merge branch 'master' of github.com:worklist/hifi
2013-03-21 16:12:09 -07:00
Stephen Birarda
4552140f61
add a sound when moving so we aren't ninjas
2013-03-21 16:11:17 -07:00
Kees van Prooijen
f308d8e004
merge with upstream master
2013-03-21 10:10:33 -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
abc0deaa78
increase the far clip
2013-03-20 16:22:24 -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
Kees van Prooijen
9ae11ffe77
more windows port
2013-03-20 12:13:14 -07:00
Stephen Birarda
f8f098cf2c
Merge branch 'master' of github.com:worklist/hifi
2013-03-19 15:58:19 -07:00
Stephen Birarda
92fc1ed1a6
receive bitstream from voxel server on client
2013-03-19 15:51:48 -07:00
Kees van Prooijen
d70da7f215
some more warning removal, temporarily excluding portaudio for windows
2013-03-19 11:49:36 -07:00
Stephen Birarda
c7213d6593
conditionally include winsock2.h instead of UNIX socket stuff
2013-03-19 11:46:53 -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
5b8541eaa4
fix conditional implementation of SerialInterface
2013-03-18 16:29:06 -07:00
Stephen Birarda
6a7b40629c
remove the unused outstring method
2013-03-18 16:20:39 -07:00
Stephen Birarda
158270f20d
only use SerialInterface if on UNIX machine
2013-03-18 15:36:26 -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
Stephen Birarda
95eb241fdd
remove OS X specific menu, have voxel server point to correct DS
2013-03-13 11:07:46 -07:00
Stephen Birarda
d51f52c307
add back fred's flange, with some tuning
2013-03-12 13:59:19 -07:00
Philip Rosedale
ccd60fa07f
Merge remote-tracking branch 'origin'
2013-03-12 10:49:33 -07:00
Stephen Birarda
0739d39568
add missing copy constructors for Head and Hand
2013-03-12 10:42:41 -07:00