mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-18 03:20:33 -05:00
Code Issues Packages Projects Releases Wiki Activity
7,271 Commits 84 Branches 46 Tags
af4767d406dfd1669632f78e596bd3f2f30cee1a
Commit Graph

228 Commits

Author SHA1 Message Date
Alexander Bock
af6e15da40 Merge remote-tracking branch 'origin/master' into feature/openglstatecache 
# Conflicts:
#	ext/ghoul
#	modules/digitaluniverse/rendering/renderablebillboardscloud.cpp
#	modules/digitaluniverse/rendering/renderableplanescloud.cpp
#	src/util/screenlog.cpp
 2020-09-04 14:02:17 +02:00
Alexander Bock
2cca451898 Coding style adaptations 
Adapt to changes in Ghoul
 2020-08-25 13:47:03 +02:00
Jonathas Costa
f0c397d6be Merged maste. Changed code in multiple places to have the new memory pool working on linux (experimental yet). 2020-08-20 15:34:40 -04:00
Alexander Bock
88b6fdd9fe Add more Tracy markers in different renderables 2020-08-18 12:58:40 +02:00
Alexander Bock
b16ee5b35a Adapt to changes in Ghoul regarding string_view 
Fix compile error if Trace logging is not enabled
Limit the number of threads to a maximum of 4 for asset initialization
 2020-08-18 10:07:38 +02:00
Alexander Bock
a553f3eeff Remove optimization pragma 2020-08-07 15:46:34 +02:00
Alexander Bock
ca728a2f35 Remove some dynamic memory allocation from deferred atmosphere caster 2020-08-07 15:03:27 +02:00
Jonathas Costa
393fbdca3d OpenGL State Caching. 2020-07-31 15:59:28 -04:00
Alexander Bock
fb69d81a7a Coding style fixes 2020-07-07 13:18:41 +02:00
Jonathas Costa
b60c6cd116 Added scaling properties to eclipses. 2020-07-01 13:13:04 -04:00
Jonathas Costa
e64f557bb4 Proposed solution. 2020-06-29 15:58:04 -04:00
Alexander Bock
5e29145395 Coding style cleanup 2020-02-14 19:37:06 +01:00
Alexander Bock
c8799dcc80 Cherrypick remaining changes from the feature/catch2 branch sans the big switch to SGCT 3.0 2020-02-11 00:21:42 +01:00
Alexander Bock
d8e9db76a3 Update the copyright header to 2020 2020-02-10 21:51:01 +01:00
Alexander Bock
9491f73803 More GLM initialization fixes 2020-02-10 01:18:27 +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
947a78a204 Changed night color behavior. 2020-01-27 14:58:05 -05:00
Jonathas Costa
6dcaa9e299 Merged master. 2020-01-27 14:26:21 -05:00
Alexander Bock
207db3c824 Remove PowerScaledCoordinates and rename PowerScaledSphere to Sphere (closes #4) 2019-12-27 23:29:28 +01:00
Jonathas Costa
ae58cdc093 Merged 2019-08-22 17:35:19 -04:00
Jonathas Costa
33ce712e3a Fixed Model rendering to work with the new HDR. 2019-08-20 15:34:48 -04:00
Jonathas Costa
bb44ed59d1 Ultra fast OpenSpace (still need some cleanning here and there). :-p 2019-08-18 15:59:17 -04:00
Jonathas Costa
701afc7daf Fixed bug causing atm leaking. 2019-08-18 11:50:22 -04:00
Jonathas Costa
a713403a09 Removed interpolation from ATM. 2019-08-15 16:15:32 -04:00
Jonathas Costa
17d43d4c93 Removed unsused TMOs. Removed unused sliders and adjusted to default position others. 2019-08-15 14:23:14 -04: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
482631aa54 Fixed failed merging of master. 2019-07-31 15:05:52 -04:00
Jonathas Costa
77bc2d4e6d Improved Mars illumination. 2019-07-24 15:52:27 -04:00
Jonathas Costa
4360246863 Fixed small issues. 2019-07-23 15:37:42 -04:00
Alexander Bock
7c896eccdc Merge remote-tracking branch 'origin/master' into issue/848 2019-07-16 13:30:33 +02:00
Alexander Bock
e9fdd31c56 Feature/flying fixes (#924) 
* Removing various warnings
 * Fix the rendering of the touchbar on Mac
 * More warnings
 * Add ghoul deinitialize
 * Update SGCT repository
 2019-07-04 09:28:42 +02:00
Jonathas Costa
420879c28b Fixed and Improved ping pong. 2019-07-03 09:43:55 -04:00
Jonathas Costa
6b5ce52173 Merged master. It broke the bloom filter. 2019-06-19 20:47:37 -04:00
Jonathas Costa
5fc11c9df2 Version with no NVidia hdr (removed now), transparency back to previous and LDR to HDR in Colors. Fix compilation for testing. (JCC: Add back changes before clean up). 2019-06-19 20:14:34 -04:00
Emil Axelsson
a75bb5a5ae Fix atmosphere stereo problem 2019-06-19 18:31:07 +02:00
Jonathas Costa
447f68c3d6 Physically attenuated night light. 2019-05-19 14:41:55 -04:00
Jonathas Costa
d2ebde282b Bring back stars to the Earth's night. 2019-05-18 15:34:42 -04:00
Jonathas Costa
368292aba6 Fixed global fade-out. (#867) 2019-05-18 11:17:53 -06:00
Emil Axelsson
50ff2d96d2 Cleanup for Spheres and PSC (#827) 
* Fade fixes
  * Clean up RenderableSphere. Add orientation properties.
  * Sane defaults for Digital Universe
  * Clean up New Horizons related code
  * Add basic scene
  * Add ability to initialize rotation as quaternion and mat3
  * Adapt legacy code to new Renderable interface
 2019-04-24 13:34:49 +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
Jonathas Costa
0502197336 Improved memory consumption and performance. Added default parameters. 2019-02-25 10:02:25 -05:00
Jonathas Costa
3fea974f93 Added new tone mapping operator and enblead back the background color control. 2019-02-05 11:31:56 -05:00
Jonathas Costa
a49fcb3e53 Fixed texture scale for HDR. 2019-01-14 14:30:51 -05:00
Jonathas Costa
88ad250c85 Copied changes from old HDR branch to new one. 2019-01-10 14:17:29 -05:00
Alexander Bock
c7a96a6b59 Address clang tidy complaints 
Update Ghoul repository
Update SGCT repository
 2018-11-30 15:34:09 -05:00
Alexander Bock
9047dc7a3e Feature/globebrowsing speedup (#735) 
* Removal of ChunkRenderer, ChunkedLodGlobe, ChunkCuller, chunklevel evaluator, culling classes, layershadermanager, GpuLayer, GPUData, ChunkNode, Grid, BasicGrid, Chunk files, Angle, AABB classes, PointGlobe, Ellipsoid, TileSelector, tiledatatype, iodescription, simplerawtilerreader, rawtilereader
 * Less dynamic allocation for SkirtedGrid, LayerManager, RenderableGlobe, TextureUnit
 * Clean up memory management in RawTiles
 * Code simplification
 * Optimize shader uniform setting
 * Introduce UniformCache
 * Callback simplification
 * Turn ChunkNode into a struct
 * Use a MemoryPool to organize all ChunkNodes rather than use unique_ptr and the necessary memory allocation
 * Collect draw calls
 * Consolidate fragment shaders between local and global renderer
 * Shader cleanup and optimization
 * Update CMake to not include included shaders
 * Integrate traversal function into the looping
 * Replace std::queue with std::vector
 * Merge TextureContainer into MemoryAwareTileCache
 * Lazy computation of chunk bounding boxes
 * Memory management of LayerGroup
 * Remove class hierarchy from tileproviders (temporaltileprovider not working yet)
 * Remove PBO classes
* Chunk status stored in Chunk
* Don't create a copy of the ChunkTilePile
* Enable culling by projected area on default
* Have raw tile reader return a Tile instead of a shared_ptr to a tile
* Start making GDAL mandatory
* Increase the default lod scale factor to 15
 2018-10-30 17:20:06 -04:00
Alexander Bock
cf8d2db914 Performance Atmosphere (#746) 
* Testing new improvements.
* Torturing shaders for performance.
* Killing some bits...
* A bit or two were killed in this commit.
 2018-10-30 17:10:02 -04:00
Alexander Bock
24ef67afa0 Add helper methods to quickly render boxes (finalizing and #closes 696) 2018-09-02 02:18:40 -04:00
Emil Axelsson
518b43db02 Fix compiler warnings 2018-08-31 14:30:35 +02:00