Alexander Bock
1689dc4047
Move the PropertyOwner name specification into the constructor and adjust accordingly
2017-03-02 18:25:13 -05:00
Alexander Bock
0d03177d43
Feature/globebrowsingcleanup ( #230 )
...
* Initial restructuring of the Globebrowsing branch
* Update Ghoul repository
Fix include guards
* More cleanup
* Split texttileprovider subclasses into separate files
* Move TileProviders into namespace
* Convert static class methods into free functions
* Splitting tile subclasses into their own files
Remove `using namespace` from header file
* Split TileDataSet subclass into separate file
Update SGCT reference
* Move shader preprocessing data into internal class
* More Globebrowsing cleanup
* More cleanup
Remove unused Convexhull class
2017-02-15 21:20:05 +01:00
Alexander Bock
94e3e11188
Update copyright header to 2017
...
Update Ghoul repository
Remove libgdal link
2017-02-06 18:02:01 -05:00
Alexander Bock
dc3ded891b
Started with code cleanup of Globebrowsing
2016-12-04 10:34:25 +01:00
Alexander Bock
777e6c628f
Change tabs to spaces
2016-12-03 01:21:54 +01:00
kalbl
0df09d23ad
Add possibility to switch geographic position
2016-11-29 13:29:02 +01:00
Erik Broberg
88fd08ef96
Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace into feature/globebrowsing
2016-11-23 12:26:15 +01:00
Erik Broberg
36e3f62508
Add enabling of stats collection for ChunkedLODGlobe in GUI
2016-11-23 12:23:38 +01:00
Alexander Bock
92676c107f
Remove wrong type of whitespace
...
Remove circular header dependency
Increase the time setting of the GUI
2016-11-12 11:16:15 +01:00
kalbl
4548394f1c
Clean up and document functions in globes.
2016-10-27 15:29:41 +02:00
kalbl
b1a3814c37
Make distance switch distance dependent on globe radius.
2016-10-26 23:08:47 +02:00
kalbl
9117599043
Add check for key Layers
2016-10-26 22:15:07 +02:00
Erik Broberg
6104b1fb58
Change ColorTextures to ColorLayers etc
2016-10-26 18:49:51 +02:00
Erik Broberg
9f65907579
Refactor chunk rendering related class names and file structure
2016-10-26 18:15:31 +02:00
Erik Broberg
21b41e3ec0
Clean up and remove unused code
2016-10-26 14:40:35 +02:00
Erik Broberg
a050a58981
Solve merge conflicts
2016-10-25 19:05:37 +02:00
Erik Broberg
9eb805a39d
Merge
2016-10-25 18:30:15 +02:00
Erik Broberg
92ae076c51
Refactor CPU and GPU layer rendering settings
2016-10-25 16:35:49 +02:00
Erik Broberg
d03093d1e9
Layers have LayerRenderingSetting which syncs to GPU automatically
2016-10-24 20:17:05 +02:00
Erik Broberg
fd6dd16417
Intermediate commit: pre shader refactorization
2016-10-20 18:54:44 +02:00
kalbl
7e0e913131
Remove pointglobe from renderableglobe
2016-10-20 16:01:34 +02:00
kalbl
4ff3823a26
Solve bug that caused incorrect height for no data values.
2016-10-20 15:04:59 +02:00
Erik Broberg
ee9bb36a06
TileProviderManager -> LayerManager. Fix shader recompilation bug
2016-10-19 16:10:56 +02:00
Erik Broberg
331191bf03
Renaming Layer, LayerGroup. Cache activeLayers
2016-10-19 14:44:09 +02:00
Erik Broberg
974fc6bb52
Rename TileAndTransform to ChunkTile
2016-10-19 12:18:38 +02:00
kalbl
709dabb4b1
Remove toggle every frame debug property from gui.
2016-10-18 18:29:28 +02:00
kalbl
c555a96a09
Remove use of init data for textures.
2016-10-18 18:02:14 +02:00
kalbl
8e972ff7d6
Account for tile pixel start offset and size difference when calculating height on globe.
2016-10-18 17:21:05 +02:00
kalbl
7f62bd7206
Create namespace globebrowsing.
2016-10-18 15:40:27 +02:00
kalbl
d7ce3cabaf
Add new distance switch value PointGlobe.
2016-10-15 15:34:46 +02:00
kalbl
670497c16d
Update file structure in globebrowsing
2016-10-15 13:22:22 +02:00
kalbl
2f13b9e9f4
Simplify the ability to add more per layer settings and move layered rendering src files to separate folder.
2016-10-15 03:04:09 +02:00
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
c2603e5712
Update initial values
2016-09-30 01:54:28 +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
6637ae2849
Update Ghoul
2016-09-19 22:45:45 +02:00
Kalle Bladin
7416d7ca69
Update mod files for osirisrex
2016-09-06 22:57:29 -04:00
Erik Broberg
5cf1a4fbe1
Enable per frame toggling of RenderableGlobes for multi node sync debugging
2016-09-01 15:31:38 -04:00
Kalle Bladin
84834f230d
Merge branch 'develop' into feature/osirisrex
2016-08-29 13:01:28 -04: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
ae1f8e457b
Update RenderableGlobe to use transformation from SceneGraphnNode and fix bug in SpiceRotation.
2016-08-18 14:21:20 -04:00
Erik Broberg
5bddbcd683
Init lodScaleFactor to better reflect full screen resolution
2016-08-15 12:39:20 -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
1dd569a3e1
Solve merge conflicts and fix bug in LayeredTextureUniformProvider
2016-08-11 17:05:14 -04:00
Alexander Bock
662e25963b
Move ThreadPool class from OpenSpace into Ghoul
2016-08-03 10:58:53 +02:00