Commit Graph

57 Commits

Author SHA1 Message Date
Alexander Bock
8dce177d33 Remove more warnings on Jenkins 2018-07-05 14:40:54 -04: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
3e1a7e3769 Jenkins compile fix 2018-06-26 12:47:04 -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
b4be63af65 Feature/configuration (#605)
* Switch openspace.cfg file from a Dictionary-based loading to a variable based loading
 * Change ConfigurationManager to not use Dictionary anymore, but a struct with explicit configuration values instead
2018-04-20 18:40:21 -04:00
Alexander Bock
f38c26eff0 Remove warnings 2018-03-12 22:31:01 +01: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
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
c9a3c68f19 Fix style guide issues
Update Ghoul repository
2017-12-29 19:18:06 +01: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
669078201a Add check for usage of ghoul_assert instead of plain old assert
Update Ghoul
2017-11-16 16:12:54 -05:00
Alexander Bock
f227767492 Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor
# Conflicts:
#	modules/volume/rendering/renderabletimevaryingvolume.cpp
2017-11-12 10:50:11 -05:00
Alexander Bock
758e26789c More coding style conformance 2017-11-11 11:25:49 -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
Alexander Bock
b50b52d351 Cleanup for coding style
Add strict mode to check_style_guide script
2017-11-08 10:35:39 -06: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
Alexander Bock
c275b2f833 Feature/cmake cleanup (#381)
* Rename OnScreenGui module to ImGui
* Support multiple external module folders (closes #31)
* Cleaning up CMake files
  * Restructure application specification
  * Add parameter for library mode to all modules
  * Add functions to handle global variable state
* Misc/remove warnings (#383)
* Increase build timeout and do a clean rebuild every commit
2017-08-14 09:38:32 -04:00
Alexander Bock
cedd8adf0d Remove const qualifier from shaders as it causes shaders to not compile on Mac 2017-08-03 12:05:58 -04:00
Alexander Bock
31377466ba Remove return values from initialize and deinitialize functions 2017-07-28 17:51:25 -04:00
Alexander Bock
d95576077b More work on documentation 2017-07-25 18:06:55 -04:00
Alexander Bock
036b271d0d Change capitalization of property names 2017-07-22 18:22:44 -04:00
Alexander Bock
04bac9293b Encapsulate identifier, guiName, and description into a PropertyInfo struct 2017-07-22 17:36:03 -04:00
Alexander Bock
b584f0197e Add description to Propertys 2017-07-21 16:31:58 -04:00
Alexander Bock
77b15724b5 More shader cleanup
Remove dedicated logs folder
Change openspaceengine to create logs folder automatically
2017-07-19 15:44:30 -04:00
Alexander Bock
e7b08e1e25 Cleanup copyright information in shaders 2017-07-18 16:24:57 -04:00
Alexander Bock
7737b082d9 Removing more warnings 2017-07-17 18:03:37 -04:00
Alexander Bock
0e9edaeb12 Fix byte order mark commits
Update Ghoul
2017-07-17 15:54:00 -04:00
Alexander Bock
096e751de2 Some more cleanup with nested namespaces 2017-07-16 11:59:01 -04:00
Alexander Bock
26682669ff More work on making use of nested namespaces 2017-07-16 01:55:35 -04:00
Alexander Bock
6a198c5d93 Started some warning cleanup 2017-07-14 14:21:01 -04:00
Alexander Bock
db9db49716 Provide a static member variable Name for all OpenSpaceModules 2017-07-12 13:59:16 -04:00
Emil Axelsson
752081d31b feature/time-refactor (#294)
- Change Time class to become a non-singleton
- Move ownership of the current time to TimeManager(instead of singleton access).
- Store the Time as a Syncable in TimeManager instead of representing all member variables of Time as Syncables.
- Pass a Time object around in the update/render methods, so that renderables don't have to query the OpenSpaceEngine to know if time is paused or if it jumped.
- Introduce Timeline and Keyframe classes
- Make use of Timelineand Keyframeclasses in KeyframeInteractionMode and TimeManager
- Added basic unit tests for Timelineand Keyframe

Future work: Add interpolation schemes for keyframes. Possibly use keyframes+interpolation feature to tween/morph properties, or figure out if this should be a separate mechanism.
2017-05-22 14:01:08 +02:00
Alexander Bock
d597750398 Some more refactoring of the documentation feature 2017-05-11 13:56:06 -04:00
Alexander Bock
bcf92804b6 Updating Ghoul repository
Updating SGCT repository
Removing compiler warnings
2017-03-10 09:32:16 -05:00
Emil Axelsson
442969f2b1 Jenkins compilation fix 2017-03-02 18:50:11 +01:00
Emil Axelsson
cb7e81cf3d Add support for converting and rendering volumetric data in the cdf format. Replace DataConverter by a more general purpose TaskRunner.
Conflicts:
	modules/volume/CMakeLists.txt
	modules/volume/linearlrucache.h
	src/engine/openspaceengine.cpp
2017-03-02 18:20:01 +01:00
Alexander Bock
6199289e91 Code cleanup 2017-02-27 23:03:07 -05:00
Alexander Bock
283c83e37c Removing code analysis warnings
Start cleaning RenderEngine
2017-02-26 23:45:39 -05:00
Alexander Bock
8456087cf5 Add a style check that checks whether the correct GLM header is used
Adapted files to use the correct GLM headers
2017-02-14 13:12:59 -05:00
Alexander Bock
6d9dc2bfeb Fixed include guards
Removed unused writeToTexture file
2017-02-09 19:12:21 -05:00
Alexander Bock
94e3e11188 Update copyright header to 2017
Update Ghoul repository
Remove libgdal link
2017-02-06 18:02:01 -05:00
Alexander Bock
dbb599a5fa Separate base module into base and space 2016-12-13 14:43:44 +01:00
Alexander Bock
df543f0ec3 Cleanup of license headers
Cleanup of include guards in modules
2016-12-09 12:02:16 +01:00
Alexander Bock
a0da1514c9 Making Galaxy, iSWA, and multiresvolume modules compile again 2016-09-26 13:50:08 +02:00
Kalle Bladin
c01808ce10 Convert tabs to spaces. 2016-08-17 00:30:53 -04:00
Alexander Bock
9705c33c16 Disable default module setting for galaxy, globebrowsing, and multiresvolume
Update Ghoul repository
2016-06-24 10:55:49 +02:00