Commit Graph

78 Commits

Author SHA1 Message Date
Kollberg
da6b115b89 fixed conflicts 2019-07-02 14:58:53 -04:00
Kollberg
49d88ab56b Added webfieldlinesmanager as a member variable to renderable fieldlinessequence 2019-07-02 14:52:27 -04:00
Sovanny Huy
4551631bd5 fix bug (set LoadAtRunime to true) 2019-07-02 14:46:15 -04:00
Sovanny Huy
1dbbdce00f Merge remote-tracking branch 'origin/thesis/2019/spaceweather-stream' into thesis/2019/spaceweather-stream 2019-07-02 11:09:10 -04:00
Sovanny Huy
31a99186d5 some cleanup, and now downloads initial list 2019-07-02 11:09:01 -04:00
Sovanny Huy
8764ff9c0c downloads initial dataset 2019-07-01 16:25:10 -04:00
Kollberg
2d7e621d5c Merge branch 'thesis/2019/spaceweather-stream' of https://github.com/OpenSpace/OpenSpace into thesis/2019/spaceweather-stream 2019-07-01 13:36:01 -04:00
Kollberg
decc49d522 Added the possibility to read coloringmethod to field line asset file 2019-07-01 13:35:54 -04:00
Sovanny Huy
79e6552ec3 Merge remote-tracking branch 'origin/thesis/2019/spaceweather-stream' into thesis/2019/spaceweather-stream 2019-07-01 13:31:40 -04:00
Sovanny Huy
c4aace5df0 update member variables success 2019-07-01 13:31:18 -04:00
Kollberg
3f3fb09d80 n00bs be trippin' 2019-06-26 11:20:12 -04:00
Kollberg
f175b4a11a Minor cleanup in the shader, the direction variable is still there 2019-06-26 09:07:27 -04:00
Kollberg
65a0c17a09 resolved conflicts 2019-06-26 09:02:43 -04:00
Kollberg
1dbb0b5b29 Added direction to fl-shader, to be able to have different directions in field lines 2019-06-26 08:58:20 -04:00
Sovanny Huy
8654ff09ab added more assets for demo
and commented out experimental download function
2019-06-25 10:34:54 -04:00
Sovanny Huy
d3bb858a41 create base for new class 2019-06-21 15:28:10 -04:00
Sovanny Huy
f4b35ea36b added wsa to model in fieldlinesequence 2019-06-18 10:31:55 -04:00
Emil Axelsson
0dcf65ce4f Feature/cef speedup (#806)
* Improve cmake errors
  * Calling doMessageLoopWork more often to increase gui performance
  * Introduce frequent callbacks
  * Restructure browser update callbacks
  * Cleanup cef speedup
  * Add flag to toggle updating browser between renderable calls
  * CEF should not be used in single process mode
  * Update CEF version
  * Postbuild step for finding framework from web helper
  * Load libcef dynamically to fix issue with CEF update
  * Only include dynamic library loader on mac
  * Improve keyboard mapping support on MacOS
  * Add arrow keys
  * Rename manifest
  * Fix bug with missing blinking cursor in text fields
  * Bump minimum cmake version
  * CEF fixes: Runtime and correct helper path
  * Be true to actual sandbox compatibility specified by CEF
  * Cleanup
2019-04-24 10:53:46 +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
Emil Axelsson
2e71eaa4cb Feature/anchor and aim (#799)
Introduce the ability to navigate using an anchor and aim.
Example use: Set spacecraft as anchor and planet as aim to always look down at a planet, while followin the spacecraft in its orbit.
2019-02-19 18:46:58 +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
Emil Axelsson
902e3e6dac Feature/time interpolation (#669)
* Initial implementation
* Better approximation of target time
* Correctly use double precision for time passing
* Cleanup
* Adding proportional adjustment of delta time at end of interpolation
* Keyframe based time interpolation
* Add property for time interpolation duration. Move time interpolation methods to TimeManager.
* Fix bugs with time gui
* Make several clicks on delta time buttons work as expected
* Clean up
* Improve time interpolation for parallel connection
* Improve time API. Fix time interpolation bugs.
* Fix mac compile issue
* Add hour button
* Add missing + sign
* Remove newer images from projection buffer when going back in time
* Add comment about clearing projection buffer
* Fix bug with jumping time in parallel connection
* Rename integrateFromTime to previousFrameTime
* Compile fix for iswa module
* Address code review comments
* Code cleanup
* Fix bug causig unsmooth behaviour when pausing while interpolating in time
2018-07-13 11:07:35 +02:00
Alexander Bock
ef61dc8c16 Rename DashboardGlobeLocation to DashboardItemGlobeLocation
Remove JSON from iswa module and use openspace one instead
Remove warnings
General code cleanup
2018-07-05 12:00:32 -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
cec7d45fed Added missing changes from SunEarth day for the stereo branch. 2018-04-20 11:35:13 -04:00
Alexander Bock
4041bbb935 Cleanup (#600)
* General Code Cleanup
 * Add check for TABs to check_style_guide.py
 * Removing warnings
2018-04-19 13:27:15 -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
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
Alexander Bock
f38c26eff0 Remove warnings 2018-03-12 22:31:01 +01:00
Alexander Bock
92a168f644 Fixes in fieldlinesequence 2018-03-09 02:46:55 -05:00
Alexander Bock
9709b22bac Turn Configuration keys from std::string to constexpr const char* for better startup performance 2018-03-08 19:24:03 +01:00
Alexander Bock
5a3ef0fda2 Apply coding styles 2018-03-08 05:32:46 -05: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
ebd69d1333 Cleanup FieldlineSequence classes 2018-03-01 19:55:50 -05:00
Alexander Bock
cac2f24b40 Only make an internalInitialize in OpenSpaceModule that accepts a ghoul::Dictionary 2017-12-31 17:32:40 -05:00
Alexander Bock
dcfef3557f Update copyright header 2017-12-29 20:11:22 +01:00
Alexander Bock
59916bc0c1 Renaming path tokens
- ${BASE_PATH} -> ${BASE}
  - ${OPENSPACE_DATA} -> ${DATA}
  - Make use of new token ${WEB}
Enable Phobos and Deimos on default
Remove unused cdflist file
2017-12-26 20:49:17 +01: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
Alexander Bock
a08c678bb0 Remove erraneous enabled OpenGL checking code
Remove warnings
Reset using the star glare texture as billboard for the Sun
2017-12-12 13:07:56 -05:00
Alexander Bock
a631b7e0a3 Making most logger categories constexpr 2017-12-11 23:46:34 -05:00
Alexander Bock
719130b6b7 Jenkinswarnings (#419)
* Remove more warnings

* Removing more warnings

* More warning fixes

* More warnings

* More warnings

* Update ghoul
2017-11-16 21:19:28 -05:00
Alexander Bock
758e26789c More coding style conformance 2017-11-11 11:25:49 -05:00
Alexander Bock
7b12a241ed Remove BOMs
Fix coding style and script
2017-11-09 19:10:32 -05:00
Alexander Bock
51a71d5ce2 Compile fix to adjust to runTime method not existing anymore 2017-11-09 14:58:43 -05:00
Oskar Carlbaum
afd91fc4af Move all kameleon dependency to separate files named 'kameleonfieldlinehelper' 2017-10-22 14:55:59 +02:00
Oskar Carlbaum
69fd2ed8a4 Remove unnecessary debug messages and return false in update() if renderable is disabled 2017-10-18 23:48:39 +02:00
Oskar Carlbaum
ecc760ac12 Change ALL_CAPS constants to camelCase 2017-10-18 23:29:09 +02:00
Oskar Carlbaum
1a00d8a34f Add default colortable to data folder 2017-10-09 23:58:32 +02:00
Oskar Carlbaum
bb43dace32 Cleanup minor things 2017-10-09 23:46:20 +02:00