Commit Graph

4337 Commits

Author SHA1 Message Date
Jonathas Costa
d4dcedc663 Fixed bug in fisheye rendering. 2017-06-04 11:44:24 -04:00
Jonathas Costa
8b1dc6ede0 Loading image settings from file. 2017-06-03 09:32:06 -04:00
Jonathas Costa
fcb72e87d6 Fine tunning atm for Mars. 2017-06-02 21:21:44 -04:00
Jonathas Costa
0965ec95ba Merged Master into ATM. 2017-06-02 19:02:29 -04:00
Jonathas Costa
1dbb65059c Added missing data for Mars and stars rendering inside atm is based on observer height. 2017-06-02 17:37:25 -04:00
Alexander Bock
994ba32f44 Add the ability for LuaLibrary%s to reference script files that will be executed (closing #328)
Create documentation for Lua scripts
Add Lua script to check if a file exists
2017-06-02 17:36:00 -04:00
Jonathas Costa
87c74629b2 Fixed bug in local patch normal transformation. 2017-06-02 15:58:40 -04:00
Jonathas Costa
5685b2183d Changed G-Buffer. 2017-06-02 12:29:09 -04:00
Alexander Bock
bb3256d9e4 Add Lua callbacks that will walk a directory tree and return values as a table 2017-06-02 11:50:55 -04:00
Jonathas Costa
3638fbbe6e Added new tone mapping operator. 2017-06-02 10:55:38 -04:00
Jonathas Costa
7a4d2f8cb9 Fixed water reflectance and added gamma control to ATM (Still need the add the option to turn off the atm in globebrowsing). 2017-06-01 15:17:37 -04:00
Jonathas Costa
cfdff58ea6 Added Gamma Correction Control. 2017-06-01 13:39:35 -04:00
Kalle Bladin
b3cb3794ef Merge branch 'master' into feature/offset-slider 2017-06-01 18:32:36 +02:00
Kalle Bladin
a2342dde74 Add offset property to layer render settings. 2017-06-01 18:30:40 +02:00
Alexander Bock
7f28adc386 Add additional trace information
Prevent crash if console shader is missing
2017-06-01 12:13:19 -04:00
Alexander Bock
3fc310800e Adding paper for submission to the Journal of Open-Source Software 2017-06-01 12:04:55 -04:00
Jonathas Costa
47cb1cb17f Changed Tone Mapping Operator. 2017-06-01 11:49:14 -04:00
Emil Axelsson
5c67189c8d Add possibility to check if OsEng is instantiated 2017-06-01 14:09:06 +02:00
Alexander Bock
997d9844cf Add additional trace information
Prevent crash if console shader is missing
2017-05-31 17:51:58 -04:00
Jonathas Costa
e3e1155a0e Enabled G-Buffer for space items. 2017-05-31 17:12:44 -04:00
Alexander Bock
9ea188cb2e Fixing star shaders for Mac 2017-05-31 16:55:19 -04:00
Jonathas Costa
c87527e792 Fixed bug in shader. 2017-05-31 16:41:02 -04:00
Emil Axelsson
f231ca290e SceneLoader: Fix bug when loading directory with subdirectories 2017-05-31 11:38:33 +02:00
Emil Axelsson
ad84202d28 FramebufferRenderer: Fix bug introduced when removing compiler warnings 2017-05-31 11:30:39 +02:00
Emil Axelsson
0af7fb820f Remove extra semicolon 2017-05-31 11:17:38 +02:00
Emil Axelsson
8ee9d09559 Merge branch 'master' of github.com:OpenSpace/OpenSpace 2017-05-31 11:06:38 +02:00
Emil Axelsson
c7f6da7b0e SceneLoader: Print error when trying to load a non-existing directory 2017-05-31 11:05:58 +02:00
Jonathas Costa
0cb741e024 Improved code and changed some hdr parameters. 2017-05-30 15:42:25 -04:00
Jonathas Costa
c37cf66a52 Reflectance not working correctly yet. 2017-05-30 15:11:14 -04:00
Jonathas Costa
96e9067eed Changes to allow the correct reflectance inside ATM (code commented right now). 2017-05-30 14:23:06 -04:00
Matthew Territo
97481b481e Merge pull request #321 from OpenSpace/issue320
Add a performance warning (113186) ignore entry for OpenGL Debugger
2017-05-30 10:56:12 -06:00
Matthew Territo
64c94890f4 Add a performance warning (113186) ignore entry for OpenGL Debugger 2017-05-30 10:32:45 -06:00
Jonathas Costa
2854435458 Fixed normal in renderable planet. Added different tone mappings (not enabled by default). 2017-05-30 11:55:44 -04:00
Kalle Bladin
f51f293989 Feature/globebrowsing optimization (#310)
* Simplest possible PBO implementation.

* Add PBO class

* TileLoadJob owns raw tile data

* Working on a soluton to cache textures and reuse them

* PBO and cached textures working for one texture type. Color textures.

* Threadpool for tile requests uses LRU cache as queue

* Remove framesUntilRequestFlush

* Clean up

* Clean up

* Use prioritizing concurrent job manager

* Use TileTextureInitData to initialize RawTileDataReader.

* Class TextureContainer owns the textures to use for tiles.

* Using TileTextureInitData to determine if new caches need to be created.

* Remove WriteDataDescription

* Remove TileDataLayout

* Rendering many different layer types again

* TileProviderByLevel gives layergroup id to tile providers

* Comment away use of PBO

* Erase unfinished requests to make room for new ones

* Enable choice of PBO or not.

* Enable resetting of asynctiledataprovider

* Add the ability to use PBO and also load to CPU

* Update ghoul

* Solve culling issue.

* Texture pointer of Tile is now a raw pointer. Currently break single image tile provider and text tile provider.

* Add gpudata

* Move fetching of shader preprocessing data to LayerManager

* No comparisons to determine shader recompilation.

* Show the tile cache size in the GUI

* Clean up and comment.

* Solve bug where float is interpreted as NaN

* Enable ability to blend between layers again

* Fix single image provider

* Fix windows build error

* Fix OSX compile issue.

* Some clean up

* Showing correct texture data size

* Enable use of text tile providers again. No backgroupd image path however.

* Change cache size from GUI

* Clean up

* Solve osx compilation error.

* Update ghoul

* Make it possible to switch between PBO and not during runtime.

* Enable resetting of tile datasets

* change function module in moduleengine to identify module by name

* MemoryAwareTileCache is no longer a singleton

* Update ownership of properties for globe browsing

* Logging info about resetting tile reader.

* Logging info

* Fix requested changes

* Fix some compile warnings.

* Fix compilation warnings

* Add ability to blend values with blend parameter. Also define settings through lua dict.

* Fix some comments on pull request.

* Change formatting

* Change formatting

* Change formatting

* Fix pull request comments.

* Those are details

* Make Mercury great again.

* Make Earth great again.

* Solve conflict

* Test to sometimes use valueblending and sometimes not

* Not always use value blending

* Update ghoul

* Change from auto to explicit type.

* Update test for LRU Cache

* Include algorithm.
2017-05-30 15:37:05 +02:00
Emil Axelsson
f6da2b6472 Jenkinsfile: Start build time after individual nodes start building 2017-05-29 18:46:24 +02:00
Jonathas Costa
f33a31b214 Improve blending. Enabled stars with ATM. 2017-05-29 00:58:19 -04:00
Jonathas Costa
4ad0843cc4 Enabled G-Buffer for Stars. 2017-05-29 00:57:47 -04:00
Jonathas Costa
71aab2a187 Fixed weird black line rendered in ATM. Improved blend function. 2017-05-29 00:38:16 -04:00
Jonathas Costa
1986e6992f Enabled milkway and stars. 2017-05-29 00:37:33 -04:00
Jonathas Costa
6f987cbba2 Enabled G-Buffer for Trails. 2017-05-29 00:36:52 -04:00
Jonathas Costa
c1799560ba Enabled G-Buffer for Milkway. 2017-05-29 00:36:00 -04:00
Jonathas Costa
49f03ba958 Fixed bug in Sun position inside ATM. 2017-05-26 16:20:13 -04:00
Jonathas Costa
33fbe90dc5 Removed unsued code from main shader file. 2017-05-26 14:40:12 -04:00
Jonathas Costa
f134eb3531 Changed normals from Eye to Model space in GlobeRendering G-Buffer. Fixed and improved ground irradiance reflection. 2017-05-26 14:32:02 -04:00
Jonathas Costa
741eb0c895 Added Aerial Perspective effect. Needs tweaking. 2017-05-25 16:50:59 -04:00
Emil Axelsson
219501d4f4 Feature/luaconsole (#316)
* LuaConsole: Fix bug related to horizontal scrolling 

* LuaConsole: Sanitize input and avoid crash when the input is very long

* Split up long lines of code

* Add consts and replace auto by real type

* LuaConsole: Do not consume modifier keys
2017-05-25 18:01:21 +02:00
Alexander Bock
95d933328f Merge branch 'master' into feature/NewAtmosphere 2017-05-25 11:10:09 -04:00
Alexander Bock
8db2db6c1d Fix applications of Time::ref and replace with TimeManager calls 2017-05-25 11:09:19 -04:00
Jonathas Costa
f3151f2070 Homogenized shaders versions. 2017-05-24 21:01:32 -04:00
Jonathas Costa
11679cc231 Added new debug system for ATM precalculated textures. Cleaned up some of the ATM shaders. 2017-05-24 18:38:47 -04:00