Commit Graph

40 Commits

Author SHA1 Message Date
Alexander Bock a631b7e0a3 Making most logger categories constexpr 2017-12-11 23:46:34 -05:00
Alexander Bock f227767492 Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor
# Conflicts:
#	modules/volume/rendering/renderabletimevaryingvolume.cpp
2017-11-12 10:50:11 -05:00
Alexander Bock 758e26789c More coding style conformance 2017-11-11 11:25:49 -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
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 44806687bf Fix bug with applying colormap in RenderableBillboardsCloud 2017-11-08 12:21:15 -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
Alexander Bock e80730e9bf Fix a variety of warnings 2017-10-21 10:10:40 -04:00
Alexander Bock 40f52c54b0 Turn DU into a default module 2017-10-18 10:00:41 -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 27e6043857 Removed unused code. 2017-10-12 22:06:42 -04:00
Jonathas Costa 41bcfd91d7 Enabled caching for billboard clouds and removed debugging code. 2017-10-12 15:46:56 -04:00
Jonathas Costa 75783a5352 Fixing cache system for DU files. 2017-10-11 18:20:38 -04:00
Jonathas Costa 7ff8064ef2 Improved grid rendering for DU meshes. 2017-10-11 17:02:39 -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 ce0742668a Fixed bug in Tully galaxies rendering. 2017-10-09 13:44:38 -04:00
Jonathas Costa 624d632765 Fixed scale for Tully galaxies textures. 2017-10-09 11:59:20 -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 19c44a8c5b Changing shaders for meshes. 2017-10-08 16:42:49 -04:00
Jonathas Costa 4ab735b883 Adding DU meshes. 2017-10-08 16:42:09 -04:00
Jonathas Costa 2999dcb96e Changed to additive blending. 2017-10-07 00:19:27 -04:00
Jonathas Costa 2e57a75fcc Fixed bug in rendering matrix. 2017-10-06 23:36:57 -04:00
Jonathas Costa bc2c04df03 Fixed bugs. 2017-10-07 00:39:01 -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
Jonathas Costa cc66165731 Disabled cache. Added initial coded for RenderablePlanesCloud. 2017-10-04 14:05:35 -04:00
Jonathas Costa 600536e7f8 Added colormap range defined. Added VectorListVerifier. Added Text rendering. Added other datavar types for Tully. Added transformantion matrix. 2017-10-04 09:23:49 -04:00
Jonathas Costa 74f0da9033 Added new data, new RenderableBillboardsCloud renderable, added and fixed multiple shaders. 2017-09-22 08:12:45 -04:00
Jonathas Costa 653001f8a4 Added more data from DU. 2017-09-12 16:27:08 -04:00
Jonathas Costa e7f2f22f3d DU branch Quasar and WMAP. 2017-09-12 12:58:42 -04:00