Commit Graph

567 Commits

Author SHA1 Message Date
Alexander Bock 9f1c4e847d Feature/globals (#690)
* Move global objects out of OpenSpaceEngine
 * General cleanup of main.cpp
 * Add default_joystick asset to all scenes
 * No longer suppress mouse interaction on slave nodes
 * Window delegate uses function pointers rather than subclassing
 * Fix for false overwriting of ImGUI configuration file
 * Change default color and tilt angle of fisheye rendering
 * Restructured performance manager
 * Simplify screenshot handling
2018-08-30 11:38:47 -04:00
Alexander Bock 74fd38c260 Adapt to Ghoul change (use ghoul::to_string instead of std::to_string) 2018-07-20 13:56:15 -04:00
Alexander Bock f55828198f Adapt to UniformCache changes when updating uniform locations (closes #648) 2018-07-19 17:46:21 -04:00
Alexander Bock 0774348fc2 General cleanup
Adapt to changes in Ghoul
Make use of TextureManager
Jenkins compile fix
2018-07-19 14:43:53 -04:00
Alexander Bock dbdc5dfd28 Fix setting of FixedRotation values through assets (closes #647) 2018-07-18 19:20:49 -04:00
Alexander Bock 9a928231be Enable OrVerifier and AndVerifier to have an arbritrary (>=2) number of verifiers
Make specifying the line number in TLETranslation optional
2018-07-18 18:22:18 -04:00
Alexander Bock 54d1a506c3 Add rotation class that provides a constant rotation based on in-game time (closes #662)
Refactor functions for rotation, scaling, and translation to take UpdateData rather than current time
2018-07-18 15:28:24 -04:00
Alexander Bock 381dbf576d Display current delta time when interpolation is happening 2018-07-18 14:19:04 -04:00
Alexander Bock 1e97bae229 OpenGL logging
Print warning if OpenGL logging is disabled but loglevel is too low
Fix format of printed functions

Closes 656
2018-07-13 16:22:24 -04:00
Alexander Bock d0f3e5507a Code cleanup
Remove warnings from multiresvolume module
2018-07-13 16:02:42 -04:00
Emil Axelsson 902e3e6dac Feature/time interpolation (#669)
* Initial implementation
* Better approximation of target time
* Correctly use double precision for time passing
* Cleanup
* Adding proportional adjustment of delta time at end of interpolation
* Keyframe based time interpolation
* Add property for time interpolation duration. Move time interpolation methods to TimeManager.
* Fix bugs with time gui
* Make several clicks on delta time buttons work as expected
* Clean up
* Improve time interpolation for parallel connection
* Improve time API. Fix time interpolation bugs.
* Fix mac compile issue
* Add hour button
* Add missing + sign
* Remove newer images from projection buffer when going back in time
* Add comment about clearing projection buffer
* Fix bug with jumping time in parallel connection
* Rename integrateFromTime to previousFrameTime
* Compile fix for iswa module
* Address code review comments
* Code cleanup
* Fix bug causig unsmooth behaviour when pausing while interpolating in time
2018-07-13 11:07:35 +02:00
Emil Axelsson 6007f1d70d Feature/model lighting (#670)
* Fix NH texture and add lighting options
* Add missing comma
* Light sources: work in progress.
* Add light sources
* Remove unused values
* Add types to documentation
* Add light sources to various missions
* Code cleanup based on review
2018-07-13 09:01:43 +02:00
Emil Axelsson 1b3df16c28 Feature/time frame (#642)
* First implementation of time frames
* Add TimeFrameUnion. Only show solar system 1850-2150.
* Consider dependencies when determining whether time frame is active
* Code review fixes.
2018-07-11 10:42:06 +02:00
Alexander Bock ef61dc8c16 Rename DashboardGlobeLocation to DashboardItemGlobeLocation
Remove JSON from iswa module and use openspace one instead
Remove warnings
General code cleanup
2018-07-05 12:00:32 -04:00
Emil Axelsson 4fe4932d0e Fix bug with incorrect lighting for RenderableModels 2018-07-04 10:35:19 +02:00
Alexander Bock 99a6efca8e Declare PropertyInfo as constexpr, rather than const 2018-06-28 17:08:56 -04:00
Alexander Bock 1818304d19 Changes from std::string to const char* in PropertyInfo (#633) 2018-06-26 11:23:45 -04:00
Alexander Bock 0f5fd2c4bc Feature/torrent removal (#630)
* Remove torrent-based synchronization downloads
 * Add download URL to error message if HTTPSynchronization download fails
 * Add a grace factor to the distance conversion
 * Don't use scientific notation when displaying distances
2018-06-23 22:20:03 -04:00
Jonathas Costa c4ceb8b96c Fixed RenderablePlane billboard orientation in dome. (#620) 2018-06-22 10:37:46 -04:00
Alexander Bock 0dd7ea19c5 Fix with time advancing
Add UTC postfix to DashboardItemDate
2018-06-21 11:49:52 -04:00
Alexander Bock d0f97901d4 Add DashboardItem that can display a property value
Fix documentation of most other dashboard items
2018-06-18 12:49:03 +02:00
Alexander Bock 8d16611e9a Adapt to new Ghoul change with luaError 2018-06-11 16:33:32 +02:00
Alexander Bock 4952f8f977 Code cleanup branch (#618)
* Make height map fallback layer work again
  * Add documentation to joystick button bindings
  * Removed grouped property headers
  * Add new version number constant generated by CMake
  * Make Joystick deadzone work properly
  * Change the startup date on Earth to today
  * Fix key modifier handling
  * Add debugging indices for TreeNodeDebugging
  * Fix script schedule for OsirisRex
  * Do not open Mission schedule automatically
  * Upload default projection texture automatically

  * General code cleanup
  * Fix check_style_guide warnings
  * Remove .clang-format
  * MacOS compile fixes
  * Clang analyzer fixes
2018-06-10 04:47:34 +00:00
Jonathas Costa f7dcc9c941 Merged master into StereoATM 2018-05-14 13:23:47 -04:00
Alexander Bock a881eef156 Cleanup in Renderers 2018-04-22 09:15:42 +00:00
Alexander Bock 818ee225a5 Define a Cache path on default
Cleanup OpenSpaceEngine
Cleanup RenderEngine
  * ScreenSpaceRenderables are now owned by RenderEngine, rather than being shared_ptr
Cleanup LogFactory
2018-04-21 07:00:43 -04:00
Jonathas Costa d5af5aab5d Fixed interaction of trail points with ATM. (#602)
* Fixed interaction of trail points with ATM.
* Added fix from SunEarh day.
2018-04-20 22:47:17 -04:00
Jonathas Costa 4197bb8200 Merged master. 2018-04-20 21:37:40 -04:00
Alexander Bock b4be63af65 Feature/configuration (#605)
* Switch openspace.cfg file from a Dictionary-based loading to a variable based loading
 * Change ConfigurationManager to not use Dictionary anymore, but a struct with explicit configuration values instead
2018-04-20 18:40:21 -04:00
Jonathas Costa 535a8dd668 Merged Master. 2018-04-20 10:18:46 -04:00
Alexander Bock 4041bbb935 Cleanup (#600)
* General Code Cleanup
 * Add check for TABs to check_style_guide.py
 * Removing warnings
2018-04-19 13:27:15 -04:00
Alexander Bock 40dbf875c5 Issue/525 (#593)
* Add initializeGL and deinitializeGL methods to OpenSpaceModule Call releaseAll from ProgramObjectManager in deinitializeGL to guard against errors when deinitializing assets

* Change removeProgramObject function in RenderEngine to take a non-owning pointer instead of a reference to a unique pointer to make it compatible with the ProgramObjectManager
Update Ghoul repository

* Using ProgramObjectManager in more modules to reduce the number of programs compiled at startup
2018-04-10 15:55:52 -04:00
Emil Axelsson 0547c14389 Fix dashboard item bugs related to unloading and loading assets at runtime (#572) 2018-03-29 18:00:47 +02:00
Emil Axelsson 2eae7ac26d Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/PerformanceATM_and_Stereo 2018-03-20 13:45:15 +01:00
Emil Axelsson d64a0df5f6 Feature/thesis work merge (#566)
Web GUI from Klas Eskilson (three new modules: webgui, webbrowser and cefwebgui)
Parallel connection refactorization
Wormhole server added to the main repository
Transfer function editor work from Cristoffer Särevall
Update ghoul
2018-03-20 09:30:59 +01:00
Jonathas Costa 721bdfa752 Merged. 2018-03-16 15:17:13 -04:00
Alexander Bock db7ae7e384 Issue/453 (#556)
* Introduced guiName to PropertyOwner
  * Added requirement that PropertyOwner::identifier may not contain whitespaces
  * Changed Name to Identifier in asset and scene files
  * Added new PropertyOwner to RenderEngine that owns the ScreenSpaceRenderables
  * Moved Name and GuiPath into GUI group
  * Added user-facing names to layer groups
2018-03-16 09:21:29 -04:00
Jonathas Costa 7b99519ec4 Merge branch 'master' into feature/PerformanceATM_and_Stereo 2018-03-15 10:58:51 -04:00
Jonathas Costa cc81c125b4 Merged with problems. 2018-03-14 14:43:16 -04:00
Jonathas Costa 206ff69e41 Fixed normals. (#553) 2018-03-14 13:18:19 -04:00
Alexander Bock 2bfab657f3 Various small fixes 2018-03-14 13:13:23 -04:00
Alexander Bock 737e82584a Issue/24 (#549)
* Implemented property animation mechanism
 * Added easing functions to Ghoul and make them usable in animation
 * Make sure that we don't leave properties around if SceneGraphNodes are deleted
 * Adding opacity settings to base renderables
2018-03-13 10:35:10 -04:00
Alexander Bock 5a3ef0fda2 Apply coding styles 2018-03-08 05:32:46 -05:00
Alexander Bock a3c849843f Feature/new formatting (#547)
* Change to new logging format (closes #542)
 * Adds a screenshots folder that uses the application startup time
 * Creating focus nodes for VRT files if the info files contain location information
 * Fix issue with removing virtual properties
 * Add a method for returning the cartesian coordinates for a geolocation on a planet
2018-03-07 18:10:32 -05:00
Alexander Bock 9a00f38e09 Feature/jenkins warnings (#538)
* Remove warnings from Jenkins
 * Improve Jenkins behavior
2018-02-28 08:41:55 -05:00
Jonathas Costa 95e0cf478d Added support to G-Buffer. (#532) 2018-02-26 21:11:22 -05:00
Alexander Bock 58f79a8851 Issue/518 (#529)
* Adding ScreenSpaceSpout object to display spout textures in screen space
 * Enable the clearing of option properties
 * Fix crash in ScreenSpaceImageLocal specification
 * Split RenderablePlane into RenderablePlaneImageLocal and RenderablePlaneImageOnline
 * Add RenderablePlane Spout
 * Rename Texture parameter in ScreenSpaceImageOnline into URL

Closes #518
2018-02-23 13:24:35 -05:00
Alexander Bock 6d76080370 Simplify script precondition argument checks 2018-02-15 17:56:12 -05:00
Emil Axelsson 499879c84e Start to implement stereo support with adaptive stereoscopic depth 2018-02-14 15:05:52 +01:00
Alexander Bock cd33ec06c9 Cleanup of distance and time conversion classes, Modifies GuiSpaceTimeComponent
Changed previous slider into text field + dropbox
Added acceleration slider
Added shuffle slider (closes #479)
2018-02-08 17:42:22 -05:00