Commit Graph

788 Commits

Author SHA1 Message Date
Jonathas Costa 2d33b63383 Ignore uniform not located in globebrowsing. (It is needed when the Night layer is disabled and the perform shading is also disable - the lightDirectionCameraSpace vector is not found). 2017-07-25 16:02:41 -04:00
Jonathas Costa 9812abb487 Added an option to have the sun following the camera when using an ATM. Removed unused code. Added missing comments. 2017-07-25 15:55:52 -04:00
Jonathas Costa 7096aeb9dd Atmosphere is now a separated node in OS. Removed ATM code from renderableglobe and renderableplanet. 2017-07-24 17:05:30 -04:00
Jonathas Costa eb87fa4390 Fixed accurate normals in globebrowsing after problematic merging. 2017-07-24 13:39:32 -04:00
Jonathas Costa 20003d5b32 Merged master into NewAtmosphere. 2017-07-21 15:02:24 -04:00
Alexander Bock e661324002 Remove style guide errors
Add missing newline errors
2017-07-21 11:52:25 -04:00
Alexander Bock 77b15724b5 More shader cleanup
Remove dedicated logs folder
Change openspaceengine to create logs folder automatically
2017-07-19 15:44:30 -04:00
Alexander Bock 88265a469d Cleanup of shader code 2017-07-19 01:27:01 -04:00
Alexander Bock 0647bde8bd Jenkins compile fix 2017-07-18 18:27:30 -04:00
Alexander Bock cb53e7f3df Jenkins compile error 2017-07-18 18:17:11 -04:00
Alexander Bock e7b08e1e25 Cleanup copyright information in shaders 2017-07-18 16:24:57 -04:00
Alexander Bock 008ab4e613 Replacing void Renderable::render(const RenderData&) with Renderable::render(const RenderData&, RendererTasks&) 2017-07-18 15:47:48 -04:00
Alexander Bock 7737b082d9 Removing more warnings 2017-07-17 18:03:37 -04:00
Jonathas Costa b0c65d416b Merged master into NewAtmosphere. 2017-07-17 16:22:33 -04:00
Alexander Bock 0e9edaeb12 Fix byte order mark commits
Update Ghoul
2017-07-17 15:54:00 -04:00
Alexander Bock 096e751de2 Some more cleanup with nested namespaces 2017-07-16 11:59:01 -04:00
Alexander Bock 26682669ff More work on making use of nested namespaces 2017-07-16 01:55:35 -04:00
Alexander Bock 4dba552fd1 Started switching OpenSpace projects to nested namespaces
Various cleanups
2017-07-15 20:01:55 -04:00
Alexander Bock 00e684f7dc Merge remote-tracking branch 'origin/master' into misc/cleanup
# Conflicts:
#	data/scene/default.scene
#	modules/globebrowsing/globes/pointglobe.cpp
#	modules/globebrowsing/tile/rawtiledatareader/tiledatatype.cpp
2017-07-15 13:22:46 -04:00
Kalle Bladin a232a1a0a7 Fix compilation warnings. 2017-07-14 22:48:32 +02:00
Alexander Bock 6a198c5d93 Started some warning cleanup 2017-07-14 14:21:01 -04:00
Kalle Bladin 2e4f31ded8 Interaction Updates (#353)
* Interaction speed is not dependent on framerate

* Split up interaction code in files and perform smooth interpolation when changing focus

* Abstract interaction code in to functions.

* Interpolation time is dependent on angle to focus node.

* Use correct delta time when interpolating

* Fix bug regarding decomposition of camera rotation.

* Make orbital interaction mode behave as globe browsing and no longer use interactiondepth below ellipsoid.

* Do not always rotate with object. Depending on distance

* Remove interaction depth below ellipsoid. Now able to interact without renderable

* Remove specification of interactionDepthBelowEllipsoid and cameraMinHeight

* Remove GlobeBrowsingInteractionMode

* Rename OrbitalInteractionMode to OrbitalNavigator and no longer extend interactionmode.

* Move properties from interaction handler to orbital navigator

* Use smooth step for follow rotation interpolator

* Rename KeyframeInteractionMode to KeyframeNavigator

* Rename files

* Clean up.

* Separate mousestate from orbitalnavigator

* Clean up

* Split keybindingmanager from interactionhandler interactionhandler

* Rename interactionhandler to navigationhandler

* Rename files

* Clean up

* Take back usage of gotochunk and gotogeo

* Rename lua library navigation

* Move functionality from navigationhandler to keyframenavigator

* Update scripts for navigation

* Comment code

* Clean up

* Solve but that caused NaN values for camera position when being in center of globe and setting focus to the globe.

* Update jenkins file to remove build folder before building.

* Fix error in jenkins script

* Update jenkins file

* Update jenkins file

* Revert jenkins file

* I hope this makes Jenkins happy.

* Line endings God damnit

* Line endings

* Clean up

* Fix compilation issue

* Take back default scene.

* Fix indentation

* Move functions goToGeo and goToChunk to GlobeBrowsingModule.

* Include algorithm for std::find

* Remove auto and other clean up
2017-07-14 17:17:17 +02:00
Kalle Bladin 4ecb98f06f Feature/globe shading (#363)
* Perform Oren Nayar diffuse shading on globes.

* Remove unused propertyowner

* Enable accurate normals for globes

* Use property for accurate normals.

* Correctly calculate height when scale is changed.

* Auto update line endings to LF in main.cpp and openspaceengine.cpp

* Clean up and comment

* Convert shader indentation to spaces (Wooooops..).

* Line endings

* Line endings and small fixes

* Line endings

* Clean up
2017-07-14 16:33:03 +02:00
Klas Eskilson 98534bc1ec Normalize ALL the line endings (#361)
* Normalize ALL the line endings

* Add Ghoul respository and openspace.cfg
2017-07-13 12:08:47 -04:00
Kalle Bladin ca90faab75 Include globebrowsing module to avoid linking errors. (#360) 2017-07-13 13:31:27 +02:00
Alexander Bock db9db49716 Provide a static member variable Name for all OpenSpaceModules 2017-07-12 13:59:16 -04:00
Jonathas Costa 39b90863d6 Fixed HDR controls for multiple atm's. 2017-07-11 14:52:59 -04:00
Kalle Bladin 4f903ac030 Feature/globebrowsing (#334)
Layer support for globe browsing:

Add layers using the function openspace.globebrowsing.addLayer
Delete layers using openspace.globebrowsing.deleteLayer
Layer type does not necessarily have to be of tile type. For example solidcolor does not use tiles
Blend modes for layers are Normal, Add, Subtract, Multiply, Color
Layer adjustments to affect layers. The current only active one is chroma key to cut out a color from the layer. Transfer functions or clipping masks are examples of layer adjustments for the future.
Support for adding layer specifications for quickly accessing GIBS layers:
openspace.globebrowsing.createGibsGdalXml
openspace.globebrowsing.createTemporalGibsGdalXml
The arguments for these functions are currently strings. Would it be better to use a lua dictionary?
No data values for height layers are correctly regarded (can be seen on Earth. No longer bumps on the poles)
Other minor things:

Worked a bit on point globe to render globes at large distances. Currently not in use and doesn't have anything to do with the other things.
Concurrent job manager takes a thread pool as argument and not a pointer to one. This is because the concurrent job manager needs to have ownership of the thread pool for correct deinitialization. Will cause breaking change for users of concurrent job manager if merged in to master.


* Add ability to add layers programatically.

* Clean up

* Fix order of deletion in concurrent job manager and clean up

* Can create by level tile provider with empty dictionary.

* Add script to add GIBS datasets.

* Start working with layer adjustment

* Update mod files

* More work on point globe

* Add script to create temporal GIBS datasets.

* Update temporal tile provider to be able to take gdal descriptions without file path.

* Add adjustment property to layers.

* Rename adjustment layer

* Add adjustment code to all layer groups

* Remove caching of gdal datasets due to cluttering of folders

* Document layer support

* Update Mars mod

* Make Mercury great again.

* Cleanup and add blend mode Color

* Enable setting of layeradjustment and blend mode from mod files.

* No more use for grayscale color overlays. Use grayscale layer with color blend mode instead.

* Clean up mod files

* Clean up

* Clean up

* No need for grayscale layers. Reading grayscale in to rgb instead for color layers.

* Remove unused layer groups

* Correctly read to grayscale layers

* Update globe mod files

* Rename ColorOverlays to Overlays.

* Clean up

* Clean up

* Solve compilation error
2017-07-10 20:34:39 +02:00
Alexander Bock 0f34b05512 Increasing warning level 2017-07-08 12:40:52 -04:00
Jonathas Costa 384b99c736 Merged master into NewAtmosphere. 2017-07-05 16:44:11 -04:00
Jonathas Costa e237b6f8e6 Adding eclipse shadows to GlobeBrowsing and ATM. 2017-07-05 14:54:45 -04:00
Alexander Bock de84bd0761 Fix OpenGL compile error 2017-07-03 11:58:58 -04:00
Alexander Bock cfdeea31ae Compile fix in Pixelbuffer 2017-07-03 11:20:31 -04:00
Alexander Bock 467a6c3542 Start migrating from GLEW to glbindings
Fix compile errors from wrong function parameters in OpenGL calls
2017-07-03 01:37:53 -04:00
eriksunden 0d05d30396 Feature/packaging (#333)
* Added proper CPACK structure and added generation of openspace.h header to add verisoning information in CMake.

* Packaging(ZIP on Windows, TGZ on UNIX) and installer creation(Windows Only via NSIS) is now working.

* Fixes for packing an archive on OSX.

* Add missing files in packaging
Add install setting to the globebrowsing module to copy required gdal_data
Update Credits

* Updated application icon
2017-07-01 14:04:37 -04:00
Jonathas Costa 6f8f922335 Initial Ozone Layer absorption. 2017-06-27 15:46:04 -04:00
Jonathas Costa 9a859f2ff3 Merge branch 'master' into feature/NewAtmosphere 2017-06-21 15:44:22 -04:00
Alexander Bock 84fff83f22 GCC7 compile fix 2017-06-21 15:42:13 -04:00
Jonathas Costa a37b0388bb Merged master into atmosphere's branch. 2017-06-21 14:46:10 -04:00
Alexander Bock 396ecbe5d5 Support new TemporalTileProvider time format 2017-06-21 08:52:12 -04:00
Jonathas Costa 5f4fa714e7 Remove debug code. 2017-06-20 14:35:59 -04:00
Jonathas Costa 6af9162ec2 Added a background exposure control for atm scenes. 2017-06-20 14:29:29 -04:00
Jonathas Costa 5ad00f6b45 Added fine controls for Mie Scattering as requested by Carter and John. 2017-06-16 16:15:36 -04:00
Jonathas Costa 2b99d1a2c2 Fixed bug introduced with new rendering method for G-Buffer. 2017-06-16 14:04:21 -04:00
Jonathas Costa 70f798c2ef Fixed ATM in RenderablePlanet. No jittering anymore. Still needs reflectivity and clouds. 2017-06-09 18:26:19 -04:00
Alexander Bock e1d13a95f0 Make Globebrowsing a default module (closes #324) 2017-06-09 11:33:07 -04:00
Alexander Bock 1169625783 Update GDAL version to 2.2.0 2017-06-08 12:30:16 -04:00
Jonathas Costa 3df6dbb036 Merge branch 'master' into feature/NewAtmosphere 2017-06-08 12:13:32 -04:00
Alexander Bock 9a7eba16bd Remove warnings
Update Ghoul repository
Fix spelling mistake in openspace.cfg
2017-06-08 00:07:51 -04:00
Jonathas Costa a24d75e691 Merge branch 'feature/NewAtmosphere' of github.com:OpenSpace/OpenSpace into feature/NewAtmosphere 2017-06-07 15:16:51 -04:00