Commit Graph

35 Commits

Author SHA1 Message Date
Alexander Bock
d8e9db76a3 Update the copyright header to 2020 2020-02-10 21:51:01 +01: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
Alexander Bock
c7a96a6b59 Address clang tidy complaints
Update Ghoul repository
Update SGCT repository
2018-11-30 15:34:09 -05:00
Jonathas Costa
06119d0830 Merge branch 'master' into issue/675 2018-08-01 10:42:27 -04:00
Jonathas Costa
4e30d9c3b8 Fixed issue 675. 2018-07-31 14:50:10 -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
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
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
Alexander Bock
9f90c6c39d Reuse the same font renderer program object between DU rendering classes
Working towards #525
2018-02-26 23:13:04 -05: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
c9a3c68f19 Fix style guide issues
Update Ghoul repository
2017-12-29 19:18:06 +01:00
Alexander Bock
db668b5342 Some changes to PR #432 2017-12-18 16:25:02 -05:00
Jonathas Costa
4c0f0333af New Fade-in controlled range for planes cloud. 2017-12-12 16:47:47 -05:00
Jonathas Costa
0d83df09bf Added max text size control for DU objects. 2017-12-11 21:58:33 -05:00
Jonathas Costa
10a60e73ad Improved performance of RenderablePlanesCloud adding min size control. 2017-11-23 20:03:42 -05:00
Jonathas Costa
cd1c695944 Improved RendedrablePlanesCloud rendering times. 2017-11-22 11:55:37 -05:00
Jonathas Costa
0264a3026c Merged master into NewAtmosphere. 2017-11-15 18:12:58 -05:00
Jonathas Costa
67033c4583 Tentative fix for billbords alingment problems. 2017-11-15 17:35:00 -05:00
Jonathas Costa
929bd9ae05 Merged. 2017-11-09 15:46:46 -05: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
Jonathas Costa
69aa660885 Added fade-in/fade-out transitions for Milkyway/Tully galaxies. 2017-11-08 16:55:31 -05:00
Alexander Bock
b50b52d351 Cleanup for coding style
Add strict mode to check_style_guide script
2017-11-08 10:35:39 -06:00
Jonathas Costa
845c867380 Initial fade-in methods for DU objects. 2017-11-07 17:58:38 -05: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
1c61f56043 Various Mac related fixes 2017-10-18 09:58:12 -04:00
Jonathas Costa
a5243cf4d1 Added luminosity/size and slum controls by datavar in plane clouds. 2017-10-11 14:51:26 -04:00
Jonathas Costa
d67a89a6ed Fixed alignment problem in AMNH dome. Added dedbug code for testing the fix on the dome. 2017-10-10 15:24:50 -04:00
Jonathas Costa
624d632765 Fixed scale for Tully galaxies textures. 2017-10-09 11:59:20 -04:00
Jonathas Costa
4ab735b883 Adding DU meshes. 2017-10-08 16:42:09 -04:00
Jonathas Costa
2e57a75fcc Fixed bug in rendering matrix. 2017-10-06 23:36:57 -04:00
Jonathas Costa
dab173fc3f Rendering galaxies for Tully. Removed unused code. General clean up. 2017-10-06 22:46:25 -04:00
Jonathas Costa
611cd92f1d Adding new Renderable for Tully galaxies. Removed unsused code. Avoiding convertions. Others. 2017-10-06 18:35:32 -04:00
Jonathas Costa
a3f28a617b Updated font rendering. 2017-10-06 15:21:17 -04:00
Jonathas Costa
c1af5bc835 Missing files. 2017-10-04 14:11:38 -04:00