Commit Graph

77 Commits

Author SHA1 Message Date
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
Alexander Bock 19f8e30813 Change RenderableModel "Rotation.ModelTransform" to "ModelTransform"
Add Property descriptions to the documentation file
Remove update method from StaticTranslation
Remove spelling error in RenderableGlobe
Remove rotation from renderablemodel projection
Fix setting the Origin through the GUI
Reorder Optional and documentation arguments for DocumentationEntry, and making Optional a non-optional argument
2017-07-27 00:22:17 -04:00
Alexander Bock ce034ccc96 Remove startup warnings 2017-07-26 16:46:20 -04:00
Alexander Bock dc79a94142 Remove warnings
Update SGCT repository
Update Ghoul repository
2017-07-26 11:59:48 -04:00
Alexander Bock 53489b5302 More documentation work 2017-07-25 23:44:09 -04:00
Alexander Bock d95576077b More work on documentation 2017-07-25 18:06:55 -04:00
Jonathas Costa bd43009033 Removed debug message. 2017-07-25 13:45:37 -04:00
Jonathas Costa 7096aeb9dd Atmosphere is now a separated node in OS. Removed ATM code from renderableglobe and renderableplanet. 2017-07-24 17:05:30 -04:00
Alexander Bock 036b271d0d Change capitalization of property names 2017-07-22 18:22:44 -04:00
Alexander Bock 04bac9293b Encapsulate identifier, guiName, and description into a PropertyInfo struct 2017-07-22 17:36:03 -04:00
Alexander Bock b584f0197e Add description to Propertys 2017-07-21 16:31:58 -04:00
Jonathas Costa 20003d5b32 Merged master into NewAtmosphere. 2017-07-21 15:02:24 -04:00
Matthew Territo 40599081d9 Minor spelling, grammar, & comment cleanup 2017-07-19 23:34:48 -06:00
Alexander Bock 008ab4e613 Replacing void Renderable::render(const RenderData&) with Renderable::render(const RenderData&, RendererTasks&) 2017-07-18 15:47:48 -04:00
Alexander Bock 0963184293 Removing more warnings 2017-07-18 01:05:59 -04:00
Alexander Bock 0e9edaeb12 Fix byte order mark commits
Update Ghoul
2017-07-17 15:54:00 -04:00
Alexander Bock 096e751de2 Some more cleanup with nested namespaces 2017-07-16 11:59:01 -04:00
Klas Eskilson 98534bc1ec Normalize ALL the line endings (#361)
* Normalize ALL the line endings

* Add Ghoul respository and openspace.cfg
2017-07-13 12:08:47 -04:00
Alexander Bock 0f34b05512 Increasing warning level 2017-07-08 12:40:52 -04:00