Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-18 08:06:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
2428 commits 76 branches 59 tags 1.2 GiB
Commit graph

2428 commits

This branch
This branch
All branches
Author SHA1 Message Date
ZappoMan
66e416d4dd added VoxelNode::inFrustum() which returns OUTSIDE, INTERSECT, INSIDE to allow more optimal frustum analysis 2013-05-08 14:23:36 -07:00
ZappoMan
24501e5c68 added contains() and remove() methods 2013-05-08 14:22:03 -07:00
Andrzej Kapolka
1c8b835bb8 Merge branch 'master' of https://github.com/worklist/hifi 2013-05-08 13:15:21 -07:00
Andrzej Kapolka
caeccf59ec When the stars and the atmosphere are both on, adjust the stars' alpha value 
based on the distance from the atmosphere.
 2013-05-08 13:13:56 -07:00
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
Andrzej Kapolka
8a21823469 Render the stars, when enabled, before the atmosphere. 2013-05-08 12:11:48 -07:00
Andrzej Kapolka
4ed7176ff6 Move the sun back up again to match the lighting. 2013-05-08 12:07:21 -07:00
ZappoMan
7a5ce57b4e added alwaysDisplay mode to PerformanceWarnings class 2013-05-08 12:01:55 -07:00
Andrzej Kapolka
4defeb9feb Merge branch 'master' of https://github.com/worklist/hifi 2013-05-08 11:56:27 -07:00
Andrzej Kapolka
c34b6df2f4 Merge branch 'master' of https://github.com/worklist/hifi 
Conflicts:
	voxel-server/src/main.cpp
 2013-05-08 11:56:03 -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
Andrzej Kapolka
5138f62aef Use the "proper" alpha value (i.e., the one from the original shader). This 
makes the sky somewhat darker, but that probably just means we need more
scattering or a brighter sun.
 2013-05-08 11:50:59 -07:00
Andrzej Kapolka
82f16e7f34 Include the "sky from space" shaders, too, and use them when the camera is 
outside the atmosphere's outer radius.
 2013-05-08 11:42:31 -07:00
Philip Rosedale
131377aaf9 Converted gyro values to floats and converted to exact degrees/second per docs. 2013-05-08 11:22:49 -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
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