ZappoMan
e55661bb0f
temporarily disable add scene in voxel server
2013-05-08 11:05:43 -07:00
Philip Rosedale
de6627f922
Merge remote-tracking branch 'upstream/master'
2013-05-08 10:40:05 -07:00
Philip Rosedale
9dd2f2e589
Merge pull request #242 from ZappoMan/render_voxels_optimization
...
Fixed some bugs, and made better scenes
2013-05-08 10:34:54 -07:00
Andrzej Kapolka
310c0288c7
Changed atmosphere radius to 1000 meters.
2013-05-08 10:31:13 -07:00
ZappoMan
2bae64ad87
moved voxels file to resources directory
2013-05-08 10:11:56 -07:00
ZappoMan
91438b029d
moved voxels file to resources directory
2013-05-08 10:11:42 -07:00
ZappoMan
e508c9fedc
removed a redundant comment
2013-05-08 10:04:06 -07:00
ZappoMan
9a9656708c
CR cleanup
2013-05-08 10:03:05 -07:00
Andrzej Kapolka
8895cbeb6c
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-08 10:01:34 -07:00
Andrzej Kapolka
8d4a74cf03
Render environment -> render atmosphere.
2013-05-08 10:00:31 -07:00
Andrzej Kapolka
4567c31a26
Added licensing information from the GPU Gems site, fixed spacing.
2013-05-08 09:55:46 -07:00
Philip Rosedale
355cff21c5
Merge remote-tracking branch 'upstream/master'
2013-05-08 09:06:13 -07:00
Philip Rosedale
baf64c07dc
Added Procedural audio noise when moving, scaled to velocity
2013-05-08 09:04:38 -07:00
Jeffrey Ventrella
9e60c8a36e
increased GRAVITY_SCALE to 10.0; tidied-up avatar code; moved Orientation class to shared folder
2013-05-08 08:59:29 -07:00
ZappoMan
bc55c09ed7
Added more SceneUtils support cleaned up voxel-edit to use scene utils
...
- Added addCornersAndAxisLines() scene
- Added addSurfaceScene() scene
- moved improved addSphereScene() from voxel-edit to SceneUtils.cpp
- added command line options to voxel-edit to create different scenes
2013-05-08 02:15:39 -07:00
ZappoMan
cdf72711b5
cleaned up compiler warning
2013-05-08 02:15:10 -07:00
ZappoMan
7d4663a2d5
Merge pull request #241 from Ventrella/master
...
cleaned up some spacing issues in code formatting in Orientation class
2013-05-08 01:34:58 -07:00
ZappoMan
de969891d8
Merge branch 'master' of https://github.com/worklist/hifi into render_voxels_optimization
2013-05-08 01:19:35 -07:00
ZappoMan
b459cbc8ea
Fixed a couple bugs in pointToVoxel()
...
- fixed a byte packing bug related to having exactly 7 bits of octal data
where we weren't correctly packing the last bit and moving the byte count
forward. This resulted in bogus colors being written
- fixed a bug for points that exactly match an octet boundary test creating
voxels that are one a unit smaller than they should be
2013-05-08 01:16:07 -07:00
ZappoMan
244da2f9a5
code cleanup, new scene
2013-05-08 01:08:05 -07:00
ZappoMan
93a5f662f7
dead code cleanup
2013-05-08 01:06:43 -07:00
ZappoMan
6f05403c0d
added SceneUtils.h/.cpp which moves addSphereScene() to a common location
2013-05-08 01:06:10 -07:00
ZappoMan
7d6b28dd4d
Tweaks to createSphere() plus some new helper functions
...
- changed createSphere() to support new NATURAL mode which uses perlin
noise to create natural color and shape
- added getVoxelCount()
- coding standard cleanup
2013-05-08 01:02:55 -07:00
ZappoMan
146334e4d7
dead code cleanup
2013-05-08 00:49:37 -07:00
ZappoMan
2cee643e7c
update TREE_SCALE to 128 so it's power of 2, and MAX_VOXELS_PER_SYSTEM to 500k
2013-05-08 00:47:42 -07:00
ZappoMan
ddf49ffdec
removed addRandomSphere() which was dead code
2013-05-08 00:46:02 -07:00
ZappoMan
f1425216ba
removed VoxelSystem::createSphere() which was dead code
2013-05-08 00:45:27 -07:00
Jeffrey Ventrella
9d17df27bf
Merge remote-tracking branch 'upstream/master'
2013-05-07 18:33:21 -07:00
Jeffrey Ventrella
2d8c15e0cb
cleaned up some spacing issues in Orientarion class
2013-05-07 18:32:56 -07:00
Andrzej Kapolka
80cdd597f4
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-07 17:53:27 -07:00
ZappoMan
085bfa384a
Merge pull request #225 from PhilipRosedale/master
...
Added perlin noise example function noiseTest()
2013-05-07 17:53:07 -07:00
ZappoMan
005b2fce35
Merge pull request #223 from Ventrella/master
...
cleaned up a bunch of spacings inside of parentheses
2013-05-07 17:51:43 -07:00
Andrzej Kapolka
44f596653e
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-07 17:50:27 -07:00
ZappoMan
c8fbb037ab
Merge pull request #240 from birarda/master
...
member variable change in AgentList
2013-05-07 17:47:42 -07:00
Andrzej Kapolka
9e6e5acf19
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-07 17:42:47 -07:00
Andrzej Kapolka
7c8a06ed4d
Added wrapper classes for shaders/shader programs to ease the process of
...
compiling, linking, assigning uniforms, etc. They're modeled after the ones
included in QtOpenGL, which we can't use at the moment because they require
a Qt OpenGL context.
2013-05-07 17:40:55 -07:00
Stephen Birarda
9658c40dd6
change lastAgentId member variable to _lastAgentID
2013-05-07 17:17:47 -07:00
birarda
24193bf1a7
Merge pull request #239 from birarda/master
...
remove serial closing in SerialInterface destructor
2013-05-07 17:10:24 -07:00
Stephen Birarda
75ba88923f
remove the serial interface close in destructor, incorrect solution
2013-05-07 17:09:49 -07:00
birarda
106dd3c6d2
Merge pull request #238 from birarda/off-axis
...
exaggerate the off-axis effect, fix double variable declaration
2013-05-07 17:03:55 -07:00
Stephen Birarda
70a6466a56
fix for bearingRelativeAngleToSource breaking spatialised audio
2013-05-07 17:02:41 -07:00
Stephen Birarda
37aee09968
fix order of angle calculations
2013-05-07 15:43:28 -07:00
Stephen Birarda
681044e3a6
add debugging output and value change for off-axis
2013-05-07 15:24:15 -07:00
Andrzej Kapolka
a1c3e8515d
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-07 15:11:55 -07:00
birarda
ea12fbffa0
Merge pull request #236 from birarda/master
...
ground eve
2013-05-07 15:11:27 -07:00
Stephen Birarda
8daae1dd1d
bring eve closer to the ground after scale changes
2013-05-07 15:11:01 -07:00
Andrzej Kapolka
b245e16623
Merge branch 'master' of https://github.com/worklist/hifi
2013-05-07 15:10:55 -07:00
Andrzej Kapolka
7c9b0d8f58
Have the voxel server push out an environment packet with its regular updates.
2013-05-07 15:10:02 -07:00
birarda
a1d9ee5bfe
Merge pull request #235 from birarda/master
...
fix bytes read per avatar due to inclusion of agent ID
2013-05-07 15:06:06 -07:00
Stephen Birarda
11b2271b91
size of agent ID must be included in bytes read per avatar
2013-05-07 15:05:31 -07:00
