Commit Graph

126 Commits

Author SHA1 Message Date
Elon d32f79106b satellites_shared.asset added for debris 2019-05-30 10:30:54 -06:00
Jonathan Fransson 23fb3b1f4c change in RenderableSatellites 2019-05-30 10:23:28 -06:00
Elon c5d4204b72 runtime error, lua, satellites_shared 2019-05-30 10:20:52 -06:00
Elon 608cb9763c - 2019-05-30 10:19:49 -06:00
Jonathan Fransson 89530d6428 merge 2019-05-30 10:19:49 -06:00
Elon 79cd779057 Fail to initialize asset, debris, satellites_shared:184 2019-05-30 10:18:50 -06:00
Elon 47f8e3e82a loop debris elements 2019-05-30 10:18:08 -06:00
Jonathan Fransson cdab5707d4 push latest 2019-05-30 10:17:33 -06:00
Elon 2d6ca18ec3 started building on a new renderable from scratch 2019-05-30 10:16:31 -06:00
Jonathan Fransson 1aeee50c2a initializeGL stuff 2019-05-30 10:14:30 -06:00
Jonathan Fransson 01fefeca23 work on renderablesatellites 2019-05-30 10:14:30 -06:00
Jonathan Fransson 52174666fc work on renderablesatellites 2019-05-30 10:13:25 -06:00
Elon 371eb4eec5 correcting errors 2019-05-30 10:13:25 -06:00
Jonathan Fransson 842dda11d7 working on renderableSatellites 2019-05-30 10:12:58 -06:00
Elon 5682d31772 appearance 2019-05-30 10:09:50 -06:00
Jonathan Fransson b27b035cf8 merge 2019-05-30 10:09:49 -06:00
Elon 1a2867772a some code to test 1 sgn, more renderables 2019-05-30 10:08:24 -06:00
Jonathan Fransson b497797cf1 working on renderableSatellites 2019-05-30 10:02:14 -06:00
Elon 7586d15027 correcting errors 2019-05-30 10:01:28 -06:00
Jonathan Fransson 02cf344a22 merge 2019-05-30 10:01:28 -06:00
Elon a38635b2f0 appearance 2019-05-30 10:00:16 -06:00
Elon 5abb86c392 some code to test 1 sgn, more renderables 2019-05-30 09:57:34 -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 c7639adb15 Remove warnings in Clang 2019-01-19 14:49:31 +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 3d90ea194a Feature/other data star renderer (#770)
* Adding ability to render other data values from Star speck files
 * Add new method to OptionProperty to take vector of options
 * Make it possible to change the speck file at runtime
 * Include viridis color lut
 * Add Apogee and Galah datasets
 * Make it possible to filter stars by other data values
 * Add ability to statically filter data values
2018-11-20 11:53:20 -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 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 9a928231be Enable OrVerifier and AndVerifier to have an arbritrary (>=2) number of verifiers
Make specifying the line number in TLETranslation optional
2018-07-18 18:22:18 -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
Jonathas Costa 959dfa8ede Temporarilly moved star's rendering back to original one in order to avoid unkown night sky for non-stereo users. 2018-05-14 14:16:15 -04:00
Jonathas Costa c4ece52ca6 Requested changes for merging. Part II. 2018-04-20 19:11:38 -04:00
Jonathas Costa 64d84f3b10 Requested changes for merging. Part I. 2018-04-20 19:00:00 -04:00
Jonathas Costa 535a8dd668 Merged Master. 2018-04-20 10:18:46 -04:00
Alexander Bock 0b332a586a Render Saturn's rings without warnings (closes #584) 2018-04-12 09:50:21 -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
Jonathas Costa c50c563787 New stars for stereo rendering. 2018-03-21 18:38:28 -04:00
Jonathas Costa 721bdfa752 Merged. 2018-03-16 15:17:13 -04:00
Alexander Bock db7ae7e384 Issue/453 (#556)
* Introduced guiName to PropertyOwner
  * Added requirement that PropertyOwner::identifier may not contain whitespaces
  * Changed Name to Identifier in asset and scene files
  * Added new PropertyOwner to RenderEngine that owns the ScreenSpaceRenderables
  * Moved Name and GuiPath into GUI group
  * Added user-facing names to layer groups
2018-03-16 09:21:29 -04:00
Jonathas Costa 7b99519ec4 Merge branch 'master' into feature/PerformanceATM_and_Stereo 2018-03-15 10:58:51 -04:00
Jonathas Costa cc81c125b4 Merged with problems. 2018-03-14 14:43:16 -04:00
Alexander Bock 2bfab657f3 Various small fixes 2018-03-14 13:13:23 -04: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
Emil Axelsson f129da5648 Additive blending for stars + add star parameters 2018-02-16 14:18:16 +01:00
Emil Axelsson 656bd0e89e Star rendering: stereo support + remove psc 2018-02-15 19:04:50 +01:00
Emil Axelsson d569b8235e Fix height mapping bugs in renderable planet 2018-01-16 17:07:45 +01:00