mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-25 05:29:41 -06:00
Code Issues Packages Projects Releases Wiki Activity
7,366 Commits 83 Branches 46 Tags
8aac7d6400a723735bf3c8aa2665eee7fb42bedf
Commit Graph

50 Commits

Author SHA1 Message Date
Emma Broman
ef0eef842d Add opacity for text labels and fix constellation label opacity 2020-07-10 11:25:26 +02:00
Emma Broman
bdb6e626ba Color values specified with vec3 instead of vec4 2020-07-10 11:25:26 +02:00
Alexander Bock
f1fe2f197b General code cleanup 2020-04-14 15:48:58 +02:00
Alexander Bock
d8e9db76a3 Update the copyright header to 2020 2020-02-10 21:51:01 +01:00
Alexander Bock
c6c2eb85fb Feature/du updates (#972) 
* Updating DU for new data.
* Changed how OS handles partiview colormaps.
* Multiple changes to adapt OS' behavior for cmaps.
* Small tweaks. MW sphere is now fading in the correct spacetime.
* Added all the Star Orbits.
* Fixing bug in speck reading procedure.
* Changed code to allow comments into data region of a speck file.
* Added deep sky objects.
* Added Home label
* Fixed bug in drawelements.
* Added Sun as a separated star for better control.
* Update version numbers on DU assets
* Move starorbits into their own asset file
* Making some of the digital universe renderables fully opaque for performance gains
 2019-09-09 13:46:57 +02: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
Alexander Bock
5ad69b841b Remove extra opacity value from renderablebillboardscloud and make text labels listen to the opacity (closes #693) 2018-08-24 02:09:01 -06:00
Alexander Bock
f55828198f Adapt to UniformCache changes when updating uniform locations (closes #648) 2018-07-19 17:46:21 -04:00
Alexander Bock
0774348fc2 General cleanup 
Adapt to changes in Ghoul
Make use of TextureManager
Jenkins compile fix
 2018-07-19 14:43:53 -04:00
Jonathas Costa
b2f680e6da Fixed texture leaking. (#635) 2018-07-02 14:41:02 -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
Jonathas Costa
a5108db405 Removed unused transformations. 2018-04-21 16:45:19 -04:00
Jonathas Costa
fca8e7f46b Refined new size control and added possibility to change control size system. 2018-04-21 16:38:24 -04:00
Jonathas Costa
fc71ad1a83 Copied changes from previous branch and added new size control system. 2018-04-21 15:17:41 -04: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
Jonathas Costa
9667b6eac5 Removed unused uniforms and renamed shader files. 2018-02-05 15:13:34 -05:00
Alexander Bock
a6d33162ca Restructure loading of RenderableBillboardsCloud 2018-01-01 10:51:30 -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
6109b0c031 New Fade-in controlled range. 2017-12-12 16:20:20 -05:00
Jonathas Costa
0d83df09bf Added max text size control for DU objects. 2017-12-11 21:58:33 -05:00
Jonathas Costa
27fd0ce09e Added minsize controls for billboards. 2017-11-23 20:40:44 -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
929bd9ae05 Merged. 2017-11-09 15:46:46 -05:00
Jonathas Costa
ac15a14602 Merged. 2017-11-09 14:02:01 -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
Jonathas Costa
3818ff3839 Fixed bug in background color for atm. Adding option to enable/disable fade-in effect in DU objects. Updated Ghoul. 2017-11-08 12:04:05 -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
Jonathas Costa
ccb76b91da Fixed transformation matrix in DU. 2017-10-19 14:18:04 -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
41bcfd91d7 Enabled caching for billboard clouds and removed debugging code. 2017-10-12 15:46:56 -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
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
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