Commit Graph

1824 Commits

Author SHA1 Message Date
Jonathas Costa 8b1dc6ede0 Loading image settings from file. 2017-06-03 09:32:06 -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
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 a2342dde74 Add offset property to layer render settings. 2017-06-01 18:30:40 +02: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
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
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
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
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 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
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
Jonathas Costa 0cd56d776c Merged master into NewAtmosphere. 2017-05-24 16:53:34 -04:00
Jonathas Costa 554cbcf32a Added gBuffer filling from Globebrowsing. Changed Earth Radius for ATM calculations. Removed unsused code. 2017-05-24 16:09:28 -04:00
Emil Axelsson 752081d31b feature/time-refactor (#294)
- Change Time class to become a non-singleton
- Move ownership of the current time to TimeManager(instead of singleton access).
- Store the Time as a Syncable in TimeManager instead of representing all member variables of Time as Syncables.
- Pass a Time object around in the update/render methods, so that renderables don't have to query the OpenSpaceEngine to know if time is paused or if it jumped.
- Introduce Timeline and Keyframe classes
- Make use of Timelineand Keyframeclasses in KeyframeInteractionMode and TimeManager
- Added basic unit tests for Timelineand Keyframe

Future work: Add interpolation schemes for keyframes. Possibly use keyframes+interpolation feature to tween/morph properties, or figure out if this should be a separate mechanism.
2017-05-22 14:01:08 +02:00
Alexander Bock f22be1273a Fix property visibility to correctly ignore hidden properties 2017-05-19 16:57:12 -04:00
Jonathas Costa d632b41710 Merged master into NewAtmosphere. 2017-05-18 12:33:08 -04:00
Emil Axelsson 05a541aacb Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/luaconsole 2017-05-18 10:17:37 +02:00
Emil Axelsson d2d6810451 Change include to cstring 2017-05-18 09:38:21 +02:00
Jonathas Costa 87843b57a5 Removed dummy texture units. Fixed empty ATM. 2017-05-17 14:11:26 -04:00
Jonathas Costa 08fa7a9e7e Changing texture units use in ATM. 2017-05-17 10:08:49 -04:00
Jonathas Costa c2e4a94825 Small improvements. 2017-05-16 16:22:55 -04:00
Alexander Bock 2e38f29eb0 Enable color picking for vec3 and vec4 properties marked as color properties 2017-05-16 14:47:17 -04:00
Jonathas Costa 46864ac744 Initial rendering of Mars with ATM (Lots of fixes still needed). 2017-05-16 14:41:01 -04:00
Jonathas Costa d7f541ec3b Changed part of the Atmosphere's shaders to work with Globebrowsing (Precision problems to be fixed). 2017-05-15 17:04:00 -04:00
Alexander Bock 4568654531 Merge branch 'master' into feature/luaconsole 2017-05-15 15:29:51 -04:00
Alexander Bock f4ad2ce4c2 More include file cleanup 2017-05-15 15:27:59 -04:00
Alexander Bock 302fa06067 More code cleanup 2017-05-15 14:39:48 -04:00
Alexander Bock 3d9375277b Adding LuaConsole to global property namespace
Initial reworking of LuaConsole look and feel
2017-05-14 12:47:10 -04:00