mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-12 22:50:36 -06:00
Code Issues Packages Projects Releases Wiki Activity
5,766 Commits 85 Branches 46 Tags
c014d8b84d903b60afab2e68c3bbbc02c49f554e
Commit Graph

84 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
Emil Axelsson
ec89a5a4f9 Fix bugs in volumetric rendering 2018-07-03 19:17:25 +02: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
Emil Axelsson
5de728442d Feature/volume tools (#614) 
* Create volume generation task

* Change domain bounds into a non-optional parameter

* Work on volume generation and rendering

* Example generation of time varying volume

* Example generation of time varying volume

* Compile fix in RenderableKameleonVolume

* Fix copy and paste error

* Enable spherical raycasting again

* Uniform naming

* Add some documentation and remove dead code
 2018-06-08 09:47:24 -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
Emil Axelsson
d64a0df5f6 Feature/thesis work merge (#566) 
Web GUI from Klas Eskilson (three new modules: webgui, webbrowser and cefwebgui)
Parallel connection refactorization
Wormhole server added to the main repository
Transfer function editor work from Cristoffer Särevall
Update ghoul
 2018-03-20 09:30:59 +01: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
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
Emil Axelsson
99e097b441 Volume rendeirng fixes: Premultiply alpha in transfer function.Update transfer function on propery change. More reasonable opacity multiplier range. 2017-11-22 19:04:19 +01: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
7e4bb0b2c6 Merge branch 'master' into feature/loadingscreen-refactor 2017-11-09 22:49:07 -06:00
Alexander Bock
afa1d6d33e Add strict test for whitespace at end of line 
More work on coding style
 2017-11-09 23:47:51 -05:00
Alexander Bock
88cf7926ae Merge branch 'master' into feature/loadingscreen-refactor 
# Conflicts:
#	modules/galaxy/rendering/renderablegalaxy.cpp
 2017-11-09 10:51:56 -05:00
Alexander Bock
8866a13ff6 More coding style fixes 2017-11-08 21:36:06 -06: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
80f5706049 Remove warnings on Clang 2017-11-07 09:19:45 -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
06550ea42f Add support for OpenGL 4.6 
Compile fix in rawvolumewriter
 2017-10-11 09:05:10 -04:00
Emil Axelsson
b77471edd0 Shader compile fix 2017-09-22 18:04:23 +02:00
Emil Axelsson
ea5382c028 Volume conversion and rendering (#350) 
Add volume rendering features
 - Improve task runner
 - Improve reading from CDF files
 - Basic time varying volume rendering
 - Fix scaling bug in RenderableToyVolume
 2017-09-22 12:03:23 +02: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
8a62e6e791 Add description to PropertyOwner 2017-08-01 17:05:52 -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
e661324002 Remove style guide errors 
Add missing newline errors
 2017-07-21 11:52:25 -04:00
Alexander Bock
0963184293 Removing more warnings 2017-07-18 01:05:59 -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
Klas Eskilson
98534bc1ec Normalize ALL the line endings (#361) 
* Normalize ALL the line endings

* Add Ghoul respository and openspace.cfg
 2017-07-13 12:08:47 -04:00
Alexander Bock
db9db49716 Provide a static member variable Name for all OpenSpaceModules 2017-07-12 13:59:16 -04:00
Alexander Bock
0f34b05512 Increasing warning level 2017-07-08 12:40:52 -04:00
Emil Axelsson
b32c416615 Improvements from code review 2017-03-03 17:39:23 +01:00
Emil Axelsson
5faff1d3bf Change to correct include guard name 2017-03-02 18:53:06 +01:00
Emil Axelsson
c2fa08716b Cleanup 2017-03-02 18:53:05 +01:00
Emil Axelsson
442969f2b1 Jenkins compilation fix 2017-03-02 18:50:11 +01:00
Emil Axelsson
e665bca128 Compile fixes 2017-03-02 18:20:04 +01:00
Emil Axelsson
2a234befe8 Begin implementing clip plane support for kameleon volumes 
Conflicts:
	modules/volume/CMakeLists.txt
 2017-03-02 18:20:04 +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