mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-10 13:41:45 -06:00
Code Issues Packages Projects Releases Wiki Activity
4,735 Commits 83 Branches 46 Tags
fc4ff258b034c5b6699c7eb188faafeb48ab6b88
Commit Graph

387 Commits

Author SHA1 Message Date
Alexander Bock
aa969795cc Factor ScreenSpaceImage into separate classes for local loading and online download (closes #296) 2017-10-10 14:16:55 -04: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
0ceab49df7 Update gitignore to include Mars texture 
Update SGCT reference
Update Ghoul reference
Prevent spherical grid to recreate grid each frame
Add version and commit information (closes #395)
 2017-08-30 14:56:02 -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
31377466ba Remove return values from initialize and deinitialize functions 2017-07-28 17:51:25 -04:00
Alexander Bock
59bccd040d Cleanup changes 2017-07-26 17:29:57 -04:00
Alexander Bock
1a475ef570 Started documenting properties 
Cleanup of Nagivationhandler properties
 2017-07-24 00:15:45 -04:00
Alexander Bock
008ab4e613 Replacing void Renderable::render(const RenderData&) with Renderable::render(const RenderData&, RendererTasks&) 2017-07-18 15:47:48 -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
4dba552fd1 Started switching OpenSpace projects to nested namespaces 
Various cleanups
 2017-07-15 20:01:55 -04:00
Alexander Bock
713b5bb97b Fix compile error in iSWA module 
Update warning specification for modules
Disable unreferenced local function warning
Update Ghoul
 2017-07-15 17:48:03 -04:00
Alexander Bock
6a198c5d93 Started some warning cleanup 2017-07-14 14:21:01 -04:00
Kalle Bladin
2e4f31ded8 Interaction Updates (#353) 
* Interaction speed is not dependent on framerate

* Split up interaction code in files and perform smooth interpolation when changing focus

* Abstract interaction code in to functions.

* Interpolation time is dependent on angle to focus node.

* Use correct delta time when interpolating

* Fix bug regarding decomposition of camera rotation.

* Make orbital interaction mode behave as globe browsing and no longer use interactiondepth below ellipsoid.

* Do not always rotate with object. Depending on distance

* Remove interaction depth below ellipsoid. Now able to interact without renderable

* Remove specification of interactionDepthBelowEllipsoid and cameraMinHeight

* Remove GlobeBrowsingInteractionMode

* Rename OrbitalInteractionMode to OrbitalNavigator and no longer extend interactionmode.

* Move properties from interaction handler to orbital navigator

* Use smooth step for follow rotation interpolator

* Rename KeyframeInteractionMode to KeyframeNavigator

* Rename files

* Clean up.

* Separate mousestate from orbitalnavigator

* Clean up

* Split keybindingmanager from interactionhandler interactionhandler

* Rename interactionhandler to navigationhandler

* Rename files

* Clean up

* Take back usage of gotochunk and gotogeo

* Rename lua library navigation

* Move functionality from navigationhandler to keyframenavigator

* Update scripts for navigation

* Comment code

* Clean up

* Solve but that caused NaN values for camera position when being in center of globe and setting focus to the globe.

* Update jenkins file to remove build folder before building.

* Fix error in jenkins script

* Update jenkins file

* Update jenkins file

* Revert jenkins file

* I hope this makes Jenkins happy.

* Line endings God damnit

* Line endings

* Clean up

* Fix compilation issue

* Take back default scene.

* Fix indentation

* Move functions goToGeo and goToChunk to GlobeBrowsingModule.

* Include algorithm for std::find

* Remove auto and other clean up
 2017-07-14 17:17:17 +02:00
Alexander Bock
9e4e681d1e More cleanup 2017-06-09 19:29:20 -04:00
Matthew Territo
0a1101d0e4 Missing Destructors: Issue #307 (#308) 
* Adding empty destructor for Scene.

* RenderEngine Destructor empty/no longer default

* Create empty ~ScreenLog
 2017-05-18 10:13:20 +02:00
Alexander Bock
f4ad2ce4c2 More include file cleanup 2017-05-15 15:27:59 -04:00
Alexander Bock
302fa06067 More code cleanup 2017-05-15 14:39:48 -04:00
Alexander Bock
63d607281a Update SGCT repository 
Add property to toggle date rendering independent from rendering statistics
 2017-05-09 10:30:35 +01:00
Emil Axelsson
4b38b33e18 Clean up code for planet radius and bounding sphere calculation (#289) 
- Remove some power scaled coordaintes.
- Remove spice dependency from sphere geometry.
- Remove dead code.
 2017-04-18 09:58:27 +02:00
Alexander Bock
c53bbf14be Add property and configuration option to disable the scene tag on a master node (closing #247) 2017-04-17 10:55:37 -04:00
Emil Axelsson
a108ee1f8a Fix requests from code review 2017-04-04 14:25:39 +02:00
Emil Axelsson
c361e1aa03 Replace forward declarations with include statements to fix compilation on linux and osx 2017-03-17 09:57:24 +01:00
Emil Axelsson
b06864eefe Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor 2017-03-16 16:35:29 +01:00
Alexander Bock
bcf92804b6 Updating Ghoul repository 
Updating SGCT repository
Removing compiler warnings
 2017-03-10 09:32:16 -05:00
Emil Axelsson
7da999c332 Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/scenegraph-refactor 
Conflicts:
	include/openspace/engine/openspaceengine.h
	src/engine/openspaceengine.cpp
	src/engine/settingsengine.cpp
	src/engine/syncengine.cpp
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scene.cpp
	src/scene/scenegraph.cpp
	src/scene/scenegraphnode.cpp
	tests/test_scenegraphloader.inl
 2017-03-07 10:57:50 +01:00
Emil Axelsson
d7cd3a01a5 Merge branch 'develop' of github.com:OpenSpace/OpenSpace into pr/kameleonvolume 
Conflicts:
	src/engine/openspaceengine.cpp
 2017-03-03 18:08:29 +01:00
Alexander Bock
fb67e805ac Various cleanup 
Add script that counts the number of includes
 2017-03-02 19:50:05 -05:00
Emil Axelsson
686fec4f9d Add Spice kernels for Mercury and Saturn magnetosphere rendering, implement inside volume rendering for kameleon volumes 
Conflicts:
	data/scene/mercury/mercury.mod
	data/scene/saturn/saturn/saturn.mod
 2017-03-02 18:20:02 +01:00
Alexander Bock
2f2fa3b031 Update Ghoul repository to have the factory return unique_ptrs 
Adjust accordingly
 2017-03-01 22:03:48 -05:00
Alexander Bock
8fd60ce8e6 - Remove documentation.h include and replace with forward declaration 
- Move Documentation struct into documentation namespace
 2017-03-01 18:13:15 -05:00
Alexander Bock
55f002ad6f Move the disabling of the rendering on the master into the RenderEngine 
instead of specifying it in the OpenSpaceEngine
 2017-03-01 10:39:29 -05:00
Alexander Bock
3e2c56c940 Steps towards moving dedicated lua functions into properties 2017-02-28 23:15:11 -05:00
Alexander Bock
78f2f0a35e Some more cleanup of RenderEngine 2017-02-27 16:40:50 -05:00
Alexander Bock
283c83e37c Removing code analysis warnings 
Start cleaning RenderEngine
 2017-02-26 23:45:39 -05:00
Alexander Bock
bc75334eb4 Use exceptions instead of success return values for initialize and 
create methods
 2017-02-25 18:08:53 -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
Emil Axelsson
4751ce36c4 Refactor scene graph: Move scene loading to separate class. 2016-12-30 17:08:50 +01:00
Emil Axelsson
ad3921fda5 Remove unused postRender method for scene graph nodes and renderables 2016-12-14 14:14:53 +01:00
Alexander Bock
d139dd2d22 Clean include guards in OpenSpace core 
Remove unused files
 2016-12-09 13:54:22 +01:00
Alexander Bock
af21e40074 Split up scalar, vector, and matrix properties into their own files for improved compile times 2016-11-27 01:17:38 +01:00
Alexander Bock
572257d3b0 Move the rendertime into a property and remove the toggleFrametimeType 
Make OptionProperty work in Radio mode
Rename DROPDOWN and RADIO to Dropdown and Radio
 2016-11-06 22:15:52 +01:00
Alexander Bock
c469be26c3 Make toggling the performance measurements a BoolProperty of RenderEngine 2016-11-06 02:00:42 +01:00
Alexander Bock
542f92e768 Add a fix to the window resolution for Retina displays 
Add a new setting to the ConfigurationManager that can specify whether to scale the onscreen text by window size or resolution
 2016-10-18 18:52:30 +02:00
Alexander Bock
6938b59f00 Add application of blending and warping to the takeScreenshot function 2016-09-22 10:28:10 +02:00
Alexander Bock
4c9f7a46c4 Potential GCC compile fix 2016-09-21 22:47:38 +02:00
Alexander Bock
329986c0c6 Merge branch 'develop' into feature/globebrowsing 
Conflicts:
	modules/base/scale/staticscale.cpp
	modules/base/scale/staticscale.h
	modules/globebrowsing/meshes/trianglesoup.h
	modules/globebrowsing/tile/tiledataset.cpp
	modules/newhorizons/shaders/renderableModelProjection_fs.glsl
	src/interaction/interactionhandler.cpp
	src/rendering/renderengine.cpp
	src/scene/scenegraphnode.cpp
 2016-09-20 15:52:01 +02:00
Alexander Bock
8867b3439f Add central location for the core to register documentations 
Add documentation to ScreenSpaceRenderable
Add documentation to Ephemeris
Add documentation to Rotation
 2016-09-19 14:03:42 +02:00