mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-19 19:39:30 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,251 Commits 86 Branches 46 Tags
542e4c0fcbbc1911a6770f1af8a26676114b246d
Commit Graph

151 Commits

Author SHA1 Message Date
Erik Broberg
cdf954d2aa Rename: ChunkIndex -> TileIndex 2016-10-05 21:06:03 +02:00
kalbl
da947cab7e Add the settings properties gamma and multiplier to RenderableGlobe textures. 2016-10-04 00:52:18 +02:00
kalbl
bacd189d8c Add per layer settings for shading. Includes opacity. 2016-10-03 12:29:50 +02:00
kalbl
423c55ba38 Update structure of properties for renderable globes. 2016-10-02 21:30:26 +02:00
kalbl
fae89a12a0 Clean up and enable shading without night texture. 2016-09-30 00:58:11 +02:00
Alexander Bock
329986c0c6 Merge branch 'develop' into feature/globebrowsing 
Conflicts:
	modules/base/scale/staticscale.cpp
	modules/base/scale/staticscale.h
	modules/globebrowsing/meshes/trianglesoup.h
	modules/globebrowsing/tile/tiledataset.cpp
	modules/newhorizons/shaders/renderableModelProjection_fs.glsl
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scenegraphnode.cpp
 2016-09-20 15:52:01 +02:00
Alexander Bock
d3f7139f5e Merge branch 'feature/globebrowsing' into syncing 
Conflicts:
	modules/globebrowsing/tile/tileprovider/temporaltileprovider.cpp
	openspace.cfg
	src/engine/openspaceengine.cpp
	src/interaction/interactionhandler.cpp
 2016-09-20 14:48:28 +02:00
Alexander Bock
b6a13fa097 Compile fix 2016-09-20 14:10:11 +02:00
Alexander Bock
6637ae2849 Update Ghoul 2016-09-19 22:45:45 +02:00
Kalle Bladin
7a22763143 Remove texture cateory HeightMapOverlays 2016-09-14 20:08:33 -04:00
Erik Broberg
9196ec2f50 Remove local, shared, synced versions of Time. Keep one source of true 2016-09-03 19:45:58 -04:00
Kalle Bladin
84834f230d Merge branch 'develop' into feature/osirisrex 2016-08-29 13:01:28 -04:00
Alexander Bock
d5063b116c Compile fixes 2016-08-29 02:33:50 +02:00
Alexander Bock
dfa0709b11 More work into removing gdal dependency to libOpenspace 2016-08-29 02:12:33 +02:00
Kalle Bladin
14aad40e6c Fix bug that caused crash when switching on and off night textures and water masks for RenderableGlobe 2016-08-25 13:50:46 -04:00
Kalle Bladin
850ccb6d3c Update rendering of shadow texture and water mask in RenderableGlobe. 2016-08-25 00:00:22 -04:00
Kalle Bladin
628f8b479f Update updatestructures to have transform with translation, rotation and scale. 2016-08-18 16:59:51 -04:00
Kalle Bladin
ae1f8e457b Update RenderableGlobe to use transformation from SceneGraphnNode and fix bug in SpiceRotation. 2016-08-18 14:21:20 -04:00
Erik Broberg
23c4a05a96 Merge from globebrowsing 2016-08-17 20:25:58 -04:00
Erik Broberg
d4f635513d Merge branch 'develop' into feature/globebrowsing 2016-08-17 19:53:28 -04:00
Alexander Bock
c93d882ea6 Cleanup of code regarding ANSI C standard (mostly adding newlines at the end of files) 
Updating SGCT and Ghoul references
 2016-08-17 16:26:14 +02:00
Kalle Bladin
c01808ce10 Convert tabs to spaces. 2016-08-17 00:30:53 -04:00
Erik Broberg
0f21217f38 Merge branch 'feature/globebrowsing' into feature/osirisrex 2016-08-12 11:06:03 -04:00
Erik Broberg
42dc2da6f1 Each TileProvider has its own files located in tile/tileprovider/ 2016-08-12 00:14:13 -04:00
Erik Broberg
64668e9feb Merge from feature/globebrowsing 2016-08-02 19:25:23 -04:00
Erik Broberg
244c18fdc7 Solve merge conflicts: develop --> globebrowsing 2016-08-02 18:50:10 -04:00
Alexander Bock
f4f4e7de9e More Jenkins compile fixes 2016-07-27 11:01:58 +02:00
Kalle
93d661bfc6 Merge branch 'feature/osirisrex' of github.com:OpenSpace/OpenSpace-Development into feature/osirisrex 2016-07-22 17:06:02 -04:00
Kalle
5883d75047 Update render function in renderable model to avoid precision errors and remove psc dependency. 2016-07-22 17:05:34 -04:00
Erik Broberg
73e3c71b9a Init StatsCollector to disabled and delete committed stats data 2016-07-21 17:42:35 -04:00
Erik Broberg
7568912a7d Bounding chunk heights considers multiple heightmaps and handles missing data 2016-07-15 18:56:03 -04:00
Erik Broberg
2ec2c95cd7 Add forgotten updates for last commit 2016-07-15 17:16:48 -04:00
Erik Broberg
a2cd9bc19d Add static const CHUNK::DEFAULT_HEIGHT to avoid magic numbers in code 2016-07-15 14:21:29 -04:00
Erik Broberg
d06c470636 Fix bounding heights (used for culling) for chunks with heightmap overlays 2016-07-15 13:48:00 -04:00
Erik Broberg
c25d1cdc88 Enable GUI toggling of visualization of heightmap resolution and intensities 2016-07-14 17:09:35 -04:00
Erik Broberg
e13c4c2162 Make desired level from projected area work (i.e. not get zero area) around the poles 2016-07-14 13:28:53 -04:00
Kalle
2c005406fd Fix horizon culling bug 2016-07-13 11:49:57 -04:00
Erik Broberg
828ec96251 Remove debugoption limitedByAvailableData from GUI 2016-07-12 15:46:41 -04:00
Erik Broberg
6a482d4189 Improve dynamic limit of chunk level by available tile data 2016-07-12 15:34:51 -04:00
Erik Broberg
f1d8e42dff Add TileProviderGroup and use to represent tile provides in same category 2016-07-12 14:59:35 -04:00
Erik Broberg
0d1c042b0e Improve performance of chunk level evaluator by projected area 2016-07-12 13:10:20 -04:00
Kalle
6c10e89ec0 Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-07-08 13:20:19 -04:00
Kalle
3985dea808 Height map overlay working but needs to be used for height sampling on cpu. 2016-07-08 12:42:41 -04:00
Erik Broberg
cb78456739 Enable getting a default tile from TileProviders. Used e.g. when no tiles are in memory 2016-07-08 12:30:19 -04:00
Kalle
fd05a88419 Create new layer category heightmap overlay used for local datasets with alpha channel. 2016-07-07 20:59:02 -04:00
Kalle
83881e33b2 GlobeBrowsingInteractionMode makes camera follow rotation of the globe and make globebrowsing work with spice kernels 2016-07-01 17:42:49 -04:00
kbladin
e8cfd8eee4 Solve crashing in deinitialization of debug renderer. 2016-06-30 18:12:21 -04:00
Erik Broberg
992c828cce Render vertex and heightmap resolution. Fix offsetted pixel read bug in TileDataset 2016-06-29 00:32:25 -04:00
Erik Broberg
a9f7cf5444 DataCollector: Collect current time in millis and use long longs for integers 2016-06-27 19:18:54 -04:00
Erik Broberg
21c67e3199 Enable real time monitoring of StatsCollector data 2016-06-27 18:08:26 -04:00