Commit Graph

4255 Commits

Author SHA1 Message Date
Alexander Bock
9a7eba16bd Remove warnings
Update Ghoul repository
Fix spelling mistake in openspace.cfg
2017-06-08 00:07:51 -04:00
Alexander Bock
1e0240b47a Update Ghoul repository 2017-06-07 17:14:12 -04:00
Alexander Bock
ea44e7a26b Fix billboard rendering for satellite trails
Add necessary scene graph node for satellites into lodglobes/earth
Update base files of satellite TLEs
2017-06-07 12:42:21 -04:00
Kalle Bladin
5575f17b46 Feature/gdalcrashfix (#331)
Saving GDAL dataset values upon initialization of dataset to avoid calling GDAL functions afterwards since it can be done concurrently. Not done for the data reading since some (not all) GDAL dataset drivers support concurrent reading. The WMS driver does not support concurrent reading, which is why we only use one worker thread per AsyncTileDataReader. Perhaps something for the future if GDAL will ensure thread saefty.

Protecting GdalRawTileDataReader with mutex lock when initializing.

Make sure read only functions in RawTileDataReader are const.

Protecting ConcurrentJobManager with mutex lock when pushing and popping to finished jobs.
2017-06-07 16:30:41 +02:00
Michael Novén
bb05ef46a1 Update json library to latest version (#322) 2017-06-06 13:44:27 -04:00
Gene Payne
be1b211dfb Feature/satellites (#325)
* Initial commit of satellites test branch

* Modified code to work with batch TLE files from online links specified in .mod file. Does not yet auto-download the files.

* Added debug function to mod file for testing static points in orbit

* Fixed time offset bug that was corrupting satellite positions

* Minor changes for debug output and camera position.

* Changed to circle billboard for rendering satellite position

* Added satellite group name to each renderable title, and keyboard shortcuts for toggling visibility

* Added support for using ghoul luasocket lib to download latest satellite TLE files from celestrak.com

* Adding reference to updated Ghoul submodule containing luasocket changes

* Updating reference to latest Ghoul submodule in feature/satellites

* Updated reference to new ghoul version

* Updated reference to new ghoul submodule version for satellites

* Updated reference to new ghoul submodule version for satellits

* Updated versions of TLE files

* Added new Lua-accessible downloader available for scene loading

* Improved error handling for TLE files

* Updated submodule reference for ext/ghoul prior to luasocket addition

* Update SGCT reference
2017-06-06 13:42:38 -04:00
Alexander Bock
624fdd555f Merge pull request #327 from OpenSpace/feature/use-renamed-cmake-copy-macro
[Cmake] use renamed ghl_copy_files macro
2017-06-06 12:18:27 -04:00
Alexander Bock
5096e3ffad Update SGCT 2017-06-06 12:08:27 -04:00
Alexander Bock
f1d8879a8b Merge remote-tracking branch 'origin/master' into feature/use-renamed-cmake-copy-macro 2017-06-06 11:52:03 -04:00
Alexander Bock
c77fdf23ae Add predefined SGCT config for Spout sharing 2017-06-06 09:25:06 -04:00
Klas Eskilson
684327aced Update Ghoul version 2017-06-05 16:05:59 -04:00
Alexander Bock
013e448c36 Adding a Gui window to show the registered file paths (closes #329) 2017-06-03 14:29:33 -04:00
Alexander Bock
ea8442d996 Enable networked specifications for ScreenSpaceImages 2017-06-03 13:38:02 -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
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
Klas Eskilson
3b2ca27562 [Cmake] Rename use renamed ghl_copy_files macro 2017-06-02 09:47:51 -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
Emil Axelsson
5c67189c8d Add possibility to check if OsEng is instantiated 2017-06-01 14:09:06 +02: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
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
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
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
8db2db6c1d Fix applications of Time::ref and replace with TimeManager calls 2017-05-25 11:09:19 -04:00
Emil Axelsson
788d5f4b04 Add build timeout (#317) 2017-05-24 15:52:14 +02: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
Matthew Territo
3a5635d2a8 Merge pull request #312 from OpenSpace/feature/launcherconfigs
Merge feature/launcherconfigs
2017-05-22 00:03:59 -06:00
Alexander Bock
1add9be22f Implement a first working version of extra long strings in console 2017-05-19 17:26:05 -04:00
Matthew Territo
17b0034384 Put _optionParser back into use. 2017-05-19 15:22:00 -06:00
Alexander Bock
f22be1273a Fix property visibility to correctly ignore hidden properties 2017-05-19 16:57:12 -04:00
Alexander Bock
302d3eb64e Don't use outline fonts for Console
Update Ghoul repository
2017-05-19 16:39:58 -04:00
Matthew Territo
ade212665e Change tab to spaces 2017-05-19 12:15:39 -06:00
Matthew Territo
ce83666ec0 Cleanup Launcher config comments, unecessary changes, etc. 2017-05-19 12:08:55 -06:00
Matthew Territo
5086d1e5ea Merge branch 'master' into feature/launcherconfigs 2017-05-19 11:41:22 -06:00
Alexander Bock
4adae3afa1 Merge pull request #309 from OpenSpace/feature/luaconsole
Feature/luaconsole
2017-05-18 15:21:25 -04:00
Alexander Bock
36be013578 Merge remote-tracking branch 'origin/master' into feature/luaconsole 2017-05-18 15:09:06 -04:00
Alexander Bock
e7a48f150a Remove clang warning
Make the opening speed DPI scaling-dependent
2017-05-18 14:59:17 -04:00
Alexander Bock
ba19348b58 Speed up console opening (and make it depenent on the current frametime, rather than the average)
Make the ESC key close the console
Make the Numpad Enter key work the same as regular Enter key
2017-05-18 14:53:03 -04:00
Kalle Bladin
8f415ff907 Remove unnecessary misstake 2017-05-18 14:04:31 +02:00
Kalle Bladin
b46a5be65a Merge branch 'feature/luaconsole' of github.com:OpenSpace/OpenSpace into feature/luaconsole 2017-05-18 13:57:32 +02:00
Kalle Bladin
28bdf4eb32 Fix OSX issues 2017-05-18 13:57:11 +02:00
Emil Axelsson
187b7b6506 Add missing includes 2017-05-18 12:59:29 +02:00