Commit Graph

114 Commits

Author SHA1 Message Date
Alexander Bock
efffc25ce0 Feature/globals handling (#1352)
* Cleaner handling of global state
* Prevent Lua memory corruption (closes #982)
* Initialize glfw first thing to prevent weird joystick loading bug during startup
2020-10-21 22:30:05 +02:00
Alexander Bock
88b6fdd9fe Add more Tracy markers in different renderables 2020-08-18 12:58:40 +02:00
Alexander Bock
0e3539bb23 Remove dynamic allocation in RenderableTrail 2020-08-06 11:39:33 +02:00
Jonathas Costa
607a13da31 Added new Renderbin PostDeferredTransparency and PreDeferredTransparency. Fixed trails definitions when needed and satellites too. 2020-06-30 12:05:07 -04:00
Jonathas Costa
e64f557bb4 Proposed solution. 2020-06-29 15:58:04 -04:00
Micah Acinapura
6db7d503a3 Linux fixes clang (#1216)
* Changes to work on Linux.

* Multiple small fixes for Linux.

* Changes to have trails working on Linux again.

* Bring back AA Trail Lines on Linux.

* Included new branch with correction in cfitsio library linking.

* Updated SGCT.

* Changes to work on Linux.

* Remove extra #endif

* Changes to compile in Clang on Linux.

* Other fixes.

* Bring back some of the changes lost and updated clang building commands.

* requiring 10.15 for sgct, upadating sgct

Co-authored-by: Jonathas <jon.costa@gmail.com>
Co-authored-by: Tom Schober <tom@tomschober.com>
Co-authored-by: Alexander Bock <mail@alexanderbock.eu>
2020-06-25 18:55:20 -04:00
Alexander Bock
f1fe2f197b General code cleanup 2020-04-14 15:48:58 +02:00
Alexander Bock
9cb1169d58 Merge pull request #1063 from OpenSpace/bug/macosbuild
macos compile and build (still needs ring shader const fix)
2020-02-10 23:39:39 +01:00
Micah Acinapura
faccb3d948 conditional uniform set for macos 2020-02-10 16:55:21 -05:00
Alexander Bock
d8e9db76a3 Update the copyright header to 2020 2020-02-10 21:51:01 +01:00
Alexander Bock
3c88ee5de3 Merge pull request #1068 from OpenSpace/issue/1065
Issue/1065
2020-02-10 14:54:03 +01:00
Alexander Bock
24ce773da9 Update GLM version
Correctly initialize all values as they are no longer default-initialized
2020-02-10 00:09:31 +01:00
Jonathas Costa
e23efd61ad Updated shader file name on Apple. 2020-02-03 13:00:04 -05:00
Jonathas Costa
d2e442203d Added new shaders and code for Apple's trails lines. 2020-02-03 12:59:29 -05:00
Jonathas Costa
8ae8d53629 Fixed blinking (precision) problems. 2020-01-22 11:33:19 -05:00
Jonathas Costa
5708bf8416 New fast AA for lines is working. 2019-08-23 16:56:30 -04:00
Jonathas Costa
ac24a1bb56 Merged master. 2019-08-23 16:29:32 -04:00
Jonathas Costa
ff2e6db26a Merge branch 'master' into feature/FXAA 2019-08-22 16:03:14 -04:00
Jonathas Costa
805401c409 Testing... 2019-08-22 11:18:21 -04:00
Alexander Bock
071d4af9dc Remove warnings duplicating property initialization for renderabletrails 2019-08-22 16:09:54 +02:00
Jonathas Costa
df40581bf0 Merge branch 'feature/FXAA' into feature/AALines2 2019-08-21 11:26:56 -04:00
Jonathas Costa
b51eb799a5 Clean up and re-nameing. 2019-08-21 11:25:38 -04:00
Jonathas Costa
5c65801bd9 Testing new AA algorithm for current lines. 2019-08-20 23:03:49 -04:00
Alexander Bock
2806935c64 Merge pull request #943 from OpenSpace/feature/hdrOS
HDR Rendering Branch
2019-08-20 02:05:42 -06:00
Alexander Bock
67b736dd26 Merge branch 'master' into feature/FXAA 2019-08-19 17:54:14 +02:00
GPayne
c01e59635c Restored ability to change trail colors in satellite asset files. 2019-08-15 08:51:18 -06:00
GPayne
b99389ae30 Fixed problem with satellite trails rendered at a time prior to TLE epoch. Also debris added shader files to CMake file for space module. 2019-08-14 16:07:14 -06:00
GPayne
ba07837865 Merge branch 'thesis/2019/spaceDebris' into feature/satellitesgroupednodes 2019-08-13 09:56:51 -06:00
Emil Axelsson
1cba7e1d88 Render trails last 2019-08-13 11:57:08 +02:00
Emil Axelsson
904811f60d Small cleanup 2019-08-13 11:28:33 +02:00
Jonathas Costa
3a0b5f0c15 Changed rendering order back for orbits and other improvements. 2019-08-01 12:20:36 -04:00
Jonathas Costa
0f09c36aa2 Bring back changes for transparency and added new error protection for big components. 2019-07-15 10:31:08 -04:00
Jonathas Costa
ae5392dbeb Fixed depth sorting for Sun's glare. (#868)
* Fixed depth sorting for Sun's glare.
2019-05-18 11:12:05 -06:00
Elon
abf686ddf6 line fade now works useing float for orbit and period 2019-05-02 14:52:34 -06:00
Elon
f21edec80d trying to figure out how to fade lines 2019-04-24 17:12:07 -06:00
Elon
f248c42ab1 appearance 2019-04-10 13:42:43 -06: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
9f1c4e847d Feature/globals (#690)
* Move global objects out of OpenSpaceEngine
 * General cleanup of main.cpp
 * Add default_joystick asset to all scenes
 * No longer suppress mouse interaction on slave nodes
 * Window delegate uses function pointers rather than subclassing
 * Fix for false overwriting of ImGUI configuration file
 * Change default color and tilt angle of fisheye rendering
 * Restructured performance manager
 * Simplify screenshot handling
2018-08-30 11:38:47 -04: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
Alexander Bock
99a6efca8e Declare PropertyInfo as constexpr, rather than const 2018-06-28 17:08:56 -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
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
737e82584a Issue/24 (#549)
* Implemented property animation mechanism
 * Added easing functions to Ghoul and make them usable in animation
 * Make sure that we don't leave properties around if SceneGraphNodes are deleted
 * Adding opacity settings to base renderables
2018-03-13 10:35:10 -04: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
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
0264a3026c Merged master into NewAtmosphere. 2017-11-15 18:12:58 -05:00