Commit graph

2241 commits

Author SHA1 Message Date
ZappoMan
0b873dddc8 Merge pull request #244 from Ventrella/master
moved Orientation class to shared folder
2013-05-08 12:51:26 -07:00
ZappoMan
ed9a7ae900 Merge pull request #247 from ZappoMan/render_voxels_optimization
Use different voxel persist files for local or server mode
2013-05-08 12:22:03 -07:00
ZappoMan
2f3a7f8ea8 use different voxel persist files for local or server mode 2013-05-08 12:19:27 -07:00
ZappoMan
7a5ce57b4e added alwaysDisplay mode to PerformanceWarnings class 2013-05-08 12:01:55 -07:00
ZappoMan
22740ade40 Merge pull request #246 from ZappoMan/master
debug server file loading
2013-05-08 11:55:53 -07:00
ZappoMan
66bf71f8d9 debug file loading 2013-05-08 11:55:00 -07:00
ZappoMan
69c1c80c1e Merge pull request #245 from ZappoMan/master
temporarily disable add scene in voxel server
2013-05-08 11:06:44 -07:00
ZappoMan
e55661bb0f temporarily disable add scene in voxel server 2013-05-08 11:05:43 -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
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
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
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
ZappoMan
c8fbb037ab Merge pull request #240 from birarda/master
member variable change in AgentList
2013-05-07 17:47:42 -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
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
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
birarda
36c95bdee4 Merge pull request #234 from birarda/master
fix other avatar unpacking from avatar mixer bulk packet
2013-05-07 14:58:05 -07:00
Stephen Birarda
e8fbfcab05 fix unpacking of other avatars in avatar mixer bulk packet 2013-05-07 14:57:24 -07:00
birarda
a28f345847 Merge pull request #233 from birarda/master
spacing cleanup
2013-05-07 14:41:44 -07:00
Stephen Birarda
6bad72a18e spacing cleanup in audio-mixer main 2013-05-07 14:41:20 -07:00
birarda
e69b0c17a3 Merge pull request #232 from birarda/master
variable fixes for audio mixer loopback
2013-05-07 14:32:44 -07:00
Stephen Birarda
a87e0d7f7f variable fixes for audio-mixer loopback 2013-05-07 14:32:15 -07:00
birarda
68ead2f309 Merge pull request #231 from birarda/master
fix loopback from audio mixer
2013-05-07 14:30:29 -07:00