Commit Graph

32 Commits

Author SHA1 Message Date
Jonathas Costa dfdc906c58 Temporarily disabled scaleFactor for meshes. 2018-02-05 14:51:58 -05:00
Emil Axelsson 1787a44821 Fix bug introduced by setting different blend modes for individual render targets 2018-01-09 10:32:27 +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 c9a3c68f19 Fix style guide issues
Update Ghoul repository
2017-12-29 19:18:06 +01:00
Jonathas Costa 3ea918b818 Multiples fixes and added max text size for grids. 2017-12-19 17:49:30 -05:00
Alexander Bock db668b5342 Some changes to PR #432 2017-12-18 16:25:02 -05: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 0f0fb78a63 Cherry pick 0d83df09bf 2017-12-12 00:30:38 -05:00
Alexander Bock a631b7e0a3 Making most logger categories constexpr 2017-12-11 23:46:34 -05:00
Jonathas Costa 0d83df09bf Added max text size control for DU objects. 2017-12-11 21:58:33 -05:00
Jonathas Costa 5825a94e56 Improved mesh precision. 2017-11-30 12:38:30 -05:00
Jonathas Costa 0264a3026c Merged master into NewAtmosphere. 2017-11-15 18:12:58 -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
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 80f5706049 Remove warnings on Clang 2017-11-07 09:19:45 -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
Jonathas Costa 4194395e7e Fixed DU meshes g-buffer. 2017-10-30 13:24:56 -04:00
Alexander Bock e80730e9bf Fix a variety of warnings 2017-10-21 10:10:40 -04:00
Alexander Bock 1c61f56043 Various Mac related fixes 2017-10-18 09:58:12 -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
Alexander Bock 791a3c5e20 Fix indentation 2017-10-17 18:56:08 -04:00
Jonathas Costa 7ff8064ef2 Improved grid rendering for DU meshes. 2017-10-11 17:02:39 -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 f1135afdea Fixed bug in DU mesh rendering. 2017-10-09 11:32:19 -04:00
Jonathas Costa 00757ec692 Added missing files. Fixed color in renderable du meshes. 2017-10-09 08:38:21 -04:00
Jonathas Costa f510b4f8cb Finished du meshes. Added constellations. 2017-10-08 17:16:55 -04:00
Jonathas Costa 4ab735b883 Adding DU meshes. 2017-10-08 16:42:09 -04:00
Jonathas Costa e7f2f22f3d DU branch Quasar and WMAP. 2017-09-12 12:58:42 -04:00