Commit Graph

62 Commits

Author SHA1 Message Date
Malin Ejdbo 19c845b422 Add initial version of RenderablePrism 2021-05-07 16:53:13 +02:00
Malin Ejdbo 4fb8a36952 Merge branch 'master' into feature/multitexturing
* Resolve conflicts
2021-03-02 15:49:39 +01:00
Malin Ejdbo 73fd118ee2 Merge branch 'master' into feature/multitexturing
* Resolve conflicts
2021-02-01 11:57:31 +01:00
Emma Broman 76d599d284 Add a basic disc renderable 2021-01-26 15:08:37 +01:00
Alexander Bock 7004c02b86 Happy new year 2021-01-02 15:26:51 +01:00
Alexander Bock ad8af3ffeb Feature/CMake (#1443)
General CMake cleanup/overhaul
* Enable precompiled headers for all projects
* Move specifications itto separate CMakeLists files
  * Add openspace-core as a subdirectory
  * Move handle_modules functionality into modules/CMakeLists.txt
  * Move handleapplications logic into apps/CMakeLists.txt
* Introduce openspace-module-collection interface library to simplify inclusion of modules in applications
* Turn module initialization into a two-step process to adapt to the new minimal dependency scenario
* Compile time speedup
  * Remove circular dependencies between modules and core preventing multithreaded compilation on MSVC
  * Build Spice multithreaded and as static library
  * Remove dependency from core to module-webbrowser
  * Remove unused dependency from kameleon
  * Remove additional unnecessary dependencies
  * Cleanup volume/kameleon/kameleonvolume modules
  * Fix visibility issues. Restrict include paths
  * Compile kameleon in parallel
* Other cleanup
  * Only copy CEF files from one target (hard-coded to OpenSpace right now)
  * Remove unused instrumentation code
  * Remove the ability to render AABB for globes as it caused a circular dependency between GlobeBrowsing and Debugging
  * Removing compiler and cppcheck warnings
  * Turn almost all includes into non-system includes
  * Don't warn on deprecrated copy
* Updated submodules
2020-12-28 18:26:57 +01:00
Alexander Bock 8d3bf03db0 Some work on DashboardItems
- Add new DashboardItemText that displays a static text on screen (closes #1423)
 - Add the ability to change the format string to the DashboardItemDate, DashboardItemDistance, and DashboardItemSimulationIncrement
2020-12-08 23:44:24 +01:00
Malin Ejdbo 6df1667583 Add multi model format support with Assimp
* Update submodule Ghoul to point to branch feature/multitexturing

* Remove old datastructure for ModelGeometry (moved to ghoul)

* Change RenderableModel to work with new ModelGeomtry structure in
  ghoul

* Work in progress: Textures
2020-10-20 10:32:12 +02:00
Emma Broman f247b714bd Add a radial grid 2020-06-30 13:48:50 +02:00
Emma Broman 7ba5c05388 Move grid renderables to their own folder 2020-06-29 12:52:47 +02:00
Emma Broman 8122d767b5 Create a new grid renderable 2020-06-29 12:52:34 +02:00
Alexander Bock f7170a9506 Turn the scaling transformation into providing three scaling factors (x, y, z)
Add NonUniformStaticScale class to provide independent scaling factors (closes #1151)
2020-05-12 15:27:24 +02:00
Alexander Bock d8e9db76a3 Update the copyright header to 2020 2020-02-10 21:51:01 +01:00
Jonathas Costa 63470f03ec Merge branch 'master' into feature/planetlabels 2019-12-08 14:51:39 -05:00
liuloppan 386ce8bec6 Feature/nodelines (#1013)
* Setup line render between Mars and Earth

* Updating property handling

* Precision fix

* Cleanup and making functions and variables private

* Adding linewidth property

* Using opacity property for line color

* Cleanup from review
2019-12-02 15:10:11 +01:00
Jonathas Costa c6b460ab74 Added planet label rendering. Added Earth's label. 2019-11-22 18:11:49 -05:00
Emil Axelsson c97d5126ec Feature/timeline translation (#931)
* Work on timeline translations
* Add Apollo 11 Descent data
* Ability to display negative altitudes
* Expose globe translation properties
* Added timeline rotation, and some scene updates. 
* Cleaning up apollo_sites scene; fixing boulder 1 in place to adress heightmap issue
* Use quaternion slerp instaet of linear interpolation + Cleanup
* Change to old lem model while waiting for new version to be pushed to data repo
* Small fixes
2019-07-17 15:21:13 +02:00
Alexander Bock bb3db7ada7 Feature/jenkins fix (#816)
* Cleanup
* CMake cleanups
* Update current year
* Update copyright header
* Use script to return list of all modules
* Update credits, license and ghoul
2019-03-24 11:19:39 +01:00
Emil Axelsson 0d2935c43b Feature/gaia mission merge (#766)
* Add Adam Aslegård's module that renders Gaia mission stars
 * Add module for Gaia mission
 * Add CCfits and cfitsio submodules and the implemented fitsfilereader module from the OpenSpace-sun-earth-event branch
 * Add a TaskRunner to read from a fits file
2018-11-20 18:19:08 -05:00
Emil Axelsson 1632c09af3 Coordinate Axes
* Add coordinate axes renderable
 * Add debug helper
 * Add example asset
 * Fix bug with dynamic loading of assets. (#763)
2018-11-13 08:09:14 -05:00
Alexander Bock 8ddc794cda Feature/alex is flying (#729)
* Correctly specify maximum text sizes for grids
 * Use StaticScale transformations in grids and remove fixed radius
 * Fix Verifier to let grids accept non-integer min and max sizes
 * Add a new scale that changes it's value based on the current time and a reference time
 * Add a proper radiosphere that grows in real time (closes #728)
 * Add default globe customization folders to the assets (closes #724)
 * Add new dashboarditem that shows the current camera velocity (closes #702)
 * Add ability to add interesting times to a scene (closes #715)
 * Reenable keybindings gui element
 * Add ShortcutManager
 * Add ability to bind keyless keybinds to use as arbitrary shortcuts (closes #710)
2018-10-08 03:00:35 -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
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 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 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 dcfef3557f Update copyright header 2017-12-29 20:11:22 +01:00
Alexander Bock 167222c814 Feature/dashboard (#431)
Merging Dashboard branch that introduces the Dashboard, DashboardItem and moves most of the screen rendering code into a component-based layout that can also be displayed as a screenspace renderable

* Add Onscreen Dashboard
  * Add Dashboard class
  * Add DashboardItem classes and subclasses
  * Added font and fontsize customization to dashboarditems
  * Add default dashboard specifications to all scenes
  * Add tests.scene to test dashboard items
  * Add configuration options to DashboardItemDistance
  * Fix distance conversion to correctly use singular or plural values
  * Make DashboardItems unique when adding them to a dashboard
  * Correctly position test with different font sizes
  * Add Dashboard Item that enables spacing between other items
  * Add performance measurement to dashboard rendering
  * Add method to DashboardItemDistance that computes distance to surface
  * Add DashboardItemAngle that computes and prints the angle between three objects
  * Add DashboardItemInstruments that shows the instruments on New Horizons
  * Add ability to OpenSpaceModules to return a list of Luascripts defined by child objects
  * Make it possible for ScreenSpaceDashboard to work with its own dashboard or the main one
2017-12-13 17:11:54 -05:00
Alexander Bock 8e0fde947d Cleanup ScreenSpaceFramebuffer (fix orientation issue)
Add Dashboard for on-screen information (#closes 201)
2017-11-26 14:46:54 -05:00
Alexander Bock f29b15a37f Add a rotation method that follows a fixed scene graph node
Add missing file for ImGui
2017-11-10 17:15:00 -05:00
Alexander Bock 1c2622248c Remove unused shaders 2017-10-24 03:35:41 -07:00
Alexander Bock 97445f4f9f Add Scaling, Rotation, and Translation that is based on evaluation of Lua scripts 2017-10-23 14:43:25 -07:00
Alexander Bock aa969795cc Factor ScreenSpaceImage into separate classes for local loading and online download (closes #296) 2017-10-10 14:16:55 -04:00
Alexander Bock c275b2f833 Feature/cmake cleanup (#381)
* Rename OnScreenGui module to ImGui
* Support multiple external module folders (closes #31)
* Cleaning up CMake files
  * Restructure application specification
  * Add parameter for library mode to all modules
  * Add functions to handle global variable state
* Misc/remove warnings (#383)
* Increase build timeout and do a clean rebuild every commit
2017-08-14 09:38:32 -04:00
Alexander Bock 0b1c6706dd Remove unused RenderablePath
Add documentations to base module classes
Change RenderableSphere to not use power scaled coordinates
2017-05-12 11:28:10 -04:00
Alexander Bock 6199289e91 Code cleanup 2017-02-27 23:03:07 -05:00
Alexander Bock dbb599a5fa Separate base module into base and space 2016-12-13 14:43:44 +01:00
Alexander Bock fe436748bf Implementing Translation classes for Keplerian elements as well as two-line element formats (#172) 2016-12-02 15:05:49 +01:00
Alexander Bock 683fc8ee53 Pr/trails (#170)
* Implement new RenderableTrails as abstract base class
  - Implement RenderableTrailsOrbit and RenderableTrailsTrajectory as concrete instances
Remove old RenderableTrails and RenderableTrailsNew classes
Adapt mod files to the new structure

* Addressed Pull Request comments
2016-11-23 10:35:46 +01:00
Alexander Bock 7ddccd8172 Rename Ephemeris files to Translation 2016-09-26 13:49:17 +02:00
Kalle Bladin 57d47cd856 Implement class RenderableTrailNew and use it for osiris rex. Higher precision than the old one. 2016-08-23 17:29:51 -04:00
Kalle Bladin 542b9e11e6 Update SceneGraphNode to have a full transformation defined in terms of translation, scale and rotation. 2016-08-17 00:19:25 -04:00
Alexander Bock 635ce1713b Add initial implementation of rings for Saturn 2016-07-29 07:54:16 +02:00
Alexander Bock 77c8ecf6df Rename screnspace* to screenspace shaders 2016-06-16 01:02:13 +02:00
Michael Nilsson 0d49076c54 solve merge conflict with develop 2016-05-03 17:11:28 -04:00
Alexander Bock eb4904fc17 Moving pscstandard shader into base 2016-05-01 13:21:57 +02:00
Alexander Bock 6daf8cb6a0 Move nighttexture shader into base module 2016-05-01 13:08:30 +02:00
Alexander Bock c6ffc48c10 Remove DynamicEphemeris as it is superseded by StaticEphemeris 2016-04-25 14:04:05 +02:00
Michael Nilsson d390a70fb6 solve merge conflict 2016-03-30 09:51:34 -04:00
Michael Nilsson e8175ee54c solved merge conflict, fix for close(socket) in paralellconnection 2016-03-17 14:41:05 -04:00