Commit Graph

91 Commits

Author SHA1 Message Date
Alexander Bock 5a3ef0fda2 Apply coding styles 2018-03-08 05:32:46 -05: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
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
Jonathas Costa 65abb03e06 Removed unused code in RenderablePlanesCloud and changed gPosition for planes. 2018-02-05 15:58:57 -05:00
Jonathas Costa 9667b6eac5 Removed unused uniforms and renamed shader files. 2018-02-05 15:13:34 -05:00
Jonathas Costa dfdc906c58 Temporarily disabled scaleFactor for meshes. 2018-02-05 14:51:58 -05: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
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 a6d33162ca Restructure loading of RenderableBillboardsCloud 2018-01-01 10:51:30 -05:00
Alexander Bock a962cc099b Reenable caching for RenderableBillboardscloud 2018-01-01 09:53:02 -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 6089449bba Fix crash with MSAA buffer generation when compiling in Debug on Windows
Cleanup of logging behavior
2017-12-30 20:24:05 -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 3ea918b818 Multiples fixes and added max text size for grids. 2017-12-19 17:49:30 -05:00
Jonathas Costa 1c72561bff Fixes introduced. 2017-12-19 12:56:09 -05:00
Alexander Bock db668b5342 Some changes to PR #432 2017-12-18 16:25:02 -05:00
Alexander Bock a3185a0cfa Merge branch 'master' into feature/NewAtmosphere
# Conflicts:
#	modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
2017-12-18 14:49:08 -05:00
Alexander Bock 966df322cf Added additional absPath where necessary 2017-12-18 14:47:58 -05:00
Jonathas Costa c7a784f01e Updated absPath in shaders compilation. 2017-12-18 10:26:26 -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 4c0f0333af New Fade-in controlled range for planes cloud. 2017-12-12 16:47:47 -05:00
Jonathas Costa 6109b0c031 New Fade-in controlled range. 2017-12-12 16:20:20 -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 52da2297be Changed names in DU following Carter's asking. Fixed bug in min plane size clipping procedure. 2017-12-08 16:11:58 -05:00
Jonathas Costa b031245a19 Changed behaviou of max billboard sizes. 2017-12-08 13:03:36 -05:00
Jonathas Costa 24d3c5e8d2 Improved fade-io/out controls in GUI. Changed default behavior for unknown textures in renderable planes cloud. 2017-12-04 11:15:39 -05:00
Jonathas Costa 8243d09188 Fixed bug in RenderablePlanesCloud and added better fade-in gui values. 2017-12-01 15:12:20 -05:00
Jonathas Costa 5825a94e56 Improved mesh precision. 2017-11-30 12:38:30 -05:00
Jonathas Costa 27fd0ce09e Added minsize controls for billboards. 2017-11-23 20:40:44 -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 41dae755f5 Merged master. 2017-11-15 17:47:21 -05:00
Jonathas Costa 67033c4583 Tentative fix for billbords alingment problems. 2017-11-15 17:35:00 -05:00
Jonathas Costa ee4f65dab7 Added mod file control for billboard max size. 2017-11-10 14:20:32 -05:00
Jonathas Costa 9e7e45c85b Added limit for screen size of renderablebillboards. 2017-11-10 11:48:21 -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
Jonathas Costa 215807405c Docs 2017-11-09 15:03:10 -05:00
Jonathas Costa ac15a14602 Merged. 2017-11-09 14:02:01 -05:00
Jonathas Costa 081f178eb1 Added fade-in for background radiation. Changed from sigmoid to linear fading. 2017-11-09 13:03:38 -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