Commit Graph

95 Commits

Author SHA1 Message Date
Alexander Bock
99a6efca8e Declare PropertyInfo as constexpr, rather than const 2018-06-28 17:08:56 -04: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
959dfa8ede Temporarilly moved star's rendering back to original one in order to avoid unkown night sky for non-stereo users. 2018-05-14 14:16:15 -04:00
Jonathas Costa
c4ece52ca6 Requested changes for merging. Part II. 2018-04-20 19:11:38 -04:00
Jonathas Costa
64d84f3b10 Requested changes for merging. Part I. 2018-04-20 19:00:00 -04:00
Jonathas Costa
535a8dd668 Merged Master. 2018-04-20 10:18:46 -04:00
Alexander Bock
0b332a586a Render Saturn's rings without warnings (closes #584) 2018-04-12 09:50:21 -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
Jonathas Costa
c50c563787 New stars for stereo rendering. 2018-03-21 18:38:28 -04: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
Alexander Bock
2bfab657f3 Various small fixes 2018-03-14 13:13:23 -04: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
Emil Axelsson
f129da5648 Additive blending for stars + add star parameters 2018-02-16 14:18:16 +01:00
Emil Axelsson
656bd0e89e Star rendering: stereo support + remove psc 2018-02-15 19:04:50 +01:00
Emil Axelsson
d569b8235e Fix height mapping bugs in renderable planet 2018-01-16 17:07:45 +01:00
Emil Axelsson
2758b35dec Feature/mipmapping (#454)
* Enable mipmapping for textures where it was previously disabled

* Fix mipmapping for renderable projections
2018-01-09 17:52:34 +01:00
Alexander Bock
47233b8e6f Make use of UniformCache in many Renderables and switch from setUniform(const std::string&, ...) to setUniform(GLint, ...) in those cases 2017-12-31 17:31:10 -05:00
Alexander Bock
dcfef3557f Update copyright header 2017-12-29 20:11:22 +01:00
Alexander Bock
cc178d03f3 Remove clang warnings
Update SGCT repository
2017-12-29 19:47:33 +01:00
Alexander Bock
c9a3c68f19 Fix style guide issues
Update Ghoul repository
2017-12-29 19:18:06 +01:00
Jonathas Costa
eead4b7f25 Merged master into NewAtmosphere. 2017-12-14 15:55:27 -05:00
Alexander Bock
23a446cb2c Update Ghoul repository
Adapt to changes that absPath is not called automatically as often anymore
Remove atmosphereearth.scene
2017-12-13 21:55:29 -05:00
Jonathas Costa
952f8e8e13 Merged master into NewAtmosphere. 2017-12-12 13:43:40 -05:00
Alexander Bock
a631b7e0a3 Making most logger categories constexpr 2017-12-11 23:46:34 -05:00
Jonathas Costa
0264a3026c Merged master into NewAtmosphere. 2017-11-15 18:12:58 -05:00
Jonathas Costa
88803ab3c5 Fixed bug in renderablestars and added support for Sun as a simple star. 2017-11-10 18:07:25 -05:00
Alexander Bock
7e4bb0b2c6 Merge branch 'master' into feature/loadingscreen-refactor 2017-11-09 22:49:07 -06:00
Alexander Bock
afa1d6d33e Add strict test for whitespace at end of line
More work on coding style
2017-11-09 23:47:51 -05:00
Jonathas Costa
929bd9ae05 Merged. 2017-11-09 15:46:46 -05:00
Alexander Bock
88cf7926ae Merge branch 'master' into feature/loadingscreen-refactor
# Conflicts:
#	modules/galaxy/rendering/renderablegalaxy.cpp
2017-11-09 10:51:56 -05:00
Alexander Bock
8866a13ff6 More coding style fixes 2017-11-08 21:36:06 -06:00
Alexander Bock
acdfefe46d Merge branch 'master' into feature/loadingscreen-refactor
# Conflicts:
#	modules/base/rendering/renderabletrailorbit.h
#	modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
#	modules/digitaluniverse/rendering/renderableplanescloud.cpp
#	modules/digitaluniverse/rendering/renderablepoints.cpp
#	modules/galaxy/rendering/renderablegalaxy.cpp
#	modules/galaxy/rendering/renderablegalaxy.h
#	modules/kameleonvolume/rendering/renderablekameleonvolume.cpp
#	modules/kameleonvolume/rendering/renderablekameleonvolume.h
#	modules/spacecraftinstruments/rendering/renderablefov.h
#	modules/spacecraftinstruments/rendering/renderableplaneprojection.h
#	modules/toyvolume/rendering/renderabletoyvolume.cpp
#	modules/toyvolume/rendering/renderabletoyvolume.h
#	modules/volume/rendering/renderabletimevaryingvolume.cpp
#	modules/volume/rendering/renderabletimevaryingvolume.h
2017-11-08 19:10:59 -06:00
Alexander Bock
b50b52d351 Cleanup for coding style
Add strict mode to check_style_guide script
2017-11-08 10:35:39 -06:00
Alexander Bock
78e3320cde Separate Renderable::initialize into initialize and initializeGL functions
Handle initialize in a separate thread and display rudimentary loading screen
2017-11-02 14:27:35 -04:00
Alexander Bock
50fd9309ba Merge branch 'master' into feature/NewAtmosphere
# Conflicts:
#	src/rendering/renderengine.cpp
2017-10-24 15:30:22 -04:00
Alexander Bock
c204a1e9f0 Make RenderableConstellationBounds not crash if the file is missing 2017-10-21 10:27:14 -04:00
Jonathas Costa
637e74a9dc Merged master into NewAtmosphere. 2017-10-19 14:23:06 -04:00
Alexander Bock
7377d63794 Clean up digitaluniverse data folder
Add mod files
Add Moon WAC wms file
2017-10-17 21:36:54 -04:00
Jonathas Costa
2d0da72a50 Merged master into atm. 2017-08-16 12:00:28 -04:00
Jonathas Costa
758ee8bd6d Pull request changes. 2017-08-15 18:15:56 -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
8a62e6e791 Add description to PropertyOwner 2017-08-01 17:05:52 -04:00
Alexander Bock
c04b379520 Enable the selection of constellation bounds through the mod file 2017-07-29 01:57:16 -04:00
Alexander Bock
31377466ba Remove return values from initialize and deinitialize functions 2017-07-28 17:51:25 -04:00
Jonathas Costa
a55110e286 Merged master info NewAtmosphere. 2017-07-27 17:13:42 -04:00
Alexander Bock
e794f6ae01 Remove rotation and shift meridian from RenderablePlanetProjection
Unify the property names in RenderablePlanet
Remove MainFrame from RenderableShadowCylinder
Clean up dictionary keys for RenderableModel, RenderableModelProjection, RenderablePlanetProjection
2017-07-27 02:09:50 -04:00