Commit Graph

1921 Commits

Author SHA1 Message Date
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
Kalle Bladin
4ecb98f06f Feature/globe shading (#363)
* Perform Oren Nayar diffuse shading on globes.

* Remove unused propertyowner

* Enable accurate normals for globes

* Use property for accurate normals.

* Correctly calculate height when scale is changed.

* Auto update line endings to LF in main.cpp and openspaceengine.cpp

* Clean up and comment

* Convert shader indentation to spaces (Wooooops..).

* Line endings

* Line endings and small fixes

* Line endings

* Clean up
2017-07-14 16:33:03 +02:00
Jonathan Bosson
fd7971c1ed Merge branch 'master' into feature/multitouch 2017-07-13 21:02:43 -06:00
Matthew Territo
9a9fcf0ac1 Alex's recommended changes in pull #357. Add check for log directory existence
and creation
2017-07-13 20:16:01 -06:00
Jonathan Bosson
bca8af78c3 build fix, cannot bind non-const lvalue reference 2017-07-13 20:15:58 -06:00
Jonathan Bosson
d9fa55581f changes from PR comments 2017-07-13 20:10:35 -06:00
Jonathan Bosson
8b46b2a63a build fix by using new path to lib and adding CMake include paths 2017-07-13 16:50:43 -06:00
Jonathan Bosson
784343a731 link to right directory for ext lib CMakeLists 2017-07-13 16:04:37 -06:00
Jonathan Bosson
ed15412bce update libTUIO11 submodule 2017-07-13 15:53:35 -06:00
Jonathan Bosson
4df24723e9 remove old libTUIO 2017-07-13 15:51:48 -06:00
Jonathan Bosson
3322a3100f use libTUIO as submodule 2017-07-13 15:49:57 -06:00
Jonathan Bosson
c4e4e141af spaces instead of tabs 2017-07-13 13:09:25 -06:00
Jonathan Bosson
78c301ec8d Merge branch 'master' into feature/multitouch 2017-07-13 11:07:39 -06:00
Matthew Territo
9f8036fa0e Line endings 2017-07-13 11:00:50 -06: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
Matthew Territo
cdb84ac111 Merge remote-tracking branch 'origin/master' into feature/statlogs 2017-07-13 09:06:13 -06:00
Kalle Bladin
ca90faab75 Include globebrowsing module to avoid linking errors. (#360) 2017-07-13 13:31:27 +02:00
Jonathan Bosson
d8b0800488 Merge branch 'master' into feature/multitouch 2017-07-12 12:46:18 -06:00
Alexander Bock
db9db49716 Provide a static member variable Name for all OpenSpaceModules 2017-07-12 13:59:16 -04:00
Jonathan Bosson
30e1b2b4f1 make touchmarkers render on render callback over postdraw 2017-07-12 11:18:55 -06:00
Matthew Territo
f1417210fa Merge remote-tracking branch 'origin/master' into feature/statlogs 2017-07-11 13:56:40 -06:00
Alexander Bock
6d0c80cc91 Change the mouse scroll callback to accept two dimensional arguments 2017-07-11 14:35:39 -04:00
Jonathan Bosson
0fd80209d0 Merge branch 'master' into feature/multitouch 2017-07-11 12:24:33 -06:00
Matthew Territo
85eb00c022 Merge remote-tracking branch 'origin/master' into feature/statlogs 2017-07-11 12:07:06 -06:00
Alexander Bock
9258c9f858 Update Kameleon submodule 2017-07-11 13:34:50 -04:00
Jonathan Bosson
99a450fccd std on all algorithms 2017-07-10 19:04:39 -06:00
Jonathan Bosson
76e0e6c59c last merge with master 2017-07-10 18:41:06 -06:00
Jonathan Bosson
5a2e217bcb limit finger input to LMA to 3 (makes it easier to converge on 3+ cases) 2017-07-10 17:18:50 -06:00
Kalle Bladin
4f903ac030 Feature/globebrowsing (#334)
Layer support for globe browsing:

Add layers using the function openspace.globebrowsing.addLayer
Delete layers using openspace.globebrowsing.deleteLayer
Layer type does not necessarily have to be of tile type. For example solidcolor does not use tiles
Blend modes for layers are Normal, Add, Subtract, Multiply, Color
Layer adjustments to affect layers. The current only active one is chroma key to cut out a color from the layer. Transfer functions or clipping masks are examples of layer adjustments for the future.
Support for adding layer specifications for quickly accessing GIBS layers:
openspace.globebrowsing.createGibsGdalXml
openspace.globebrowsing.createTemporalGibsGdalXml
The arguments for these functions are currently strings. Would it be better to use a lua dictionary?
No data values for height layers are correctly regarded (can be seen on Earth. No longer bumps on the poles)
Other minor things:

Worked a bit on point globe to render globes at large distances. Currently not in use and doesn't have anything to do with the other things.
Concurrent job manager takes a thread pool as argument and not a pointer to one. This is because the concurrent job manager needs to have ownership of the thread pool for correct deinitialization. Will cause breaking change for users of concurrent job manager if merged in to master.


* Add ability to add layers programatically.

* Clean up

* Fix order of deletion in concurrent job manager and clean up

* Can create by level tile provider with empty dictionary.

* Add script to add GIBS datasets.

* Start working with layer adjustment

* Update mod files

* More work on point globe

* Add script to create temporal GIBS datasets.

* Update temporal tile provider to be able to take gdal descriptions without file path.

* Add adjustment property to layers.

* Rename adjustment layer

* Add adjustment code to all layer groups

* Remove caching of gdal datasets due to cluttering of folders

* Document layer support

* Update Mars mod

* Make Mercury great again.

* Cleanup and add blend mode Color

* Enable setting of layeradjustment and blend mode from mod files.

* No more use for grayscale color overlays. Use grayscale layer with color blend mode instead.

* Clean up mod files

* Clean up

* Clean up

* No need for grayscale layers. Reading grayscale in to rgb instead for color layers.

* Remove unused layer groups

* Correctly read to grayscale layers

* Update globe mod files

* Rename ColorOverlays to Overlays.

* Clean up

* Clean up

* Solve compilation error
2017-07-10 20:34:39 +02:00
Matthew Territo
6bbb90a78a Merge branch 'master' into feature/statlogs
* master:
  Make console work with Fisheye rendering
  Correctly position Screenspace renderable if a scene tag is specified
  Move SGCT config files into main config folder and remove unused transferfunctions
  Increasing warning level
2017-07-09 23:16:32 -06:00
Alexander Bock
0f34b05512 Increasing warning level 2017-07-08 12:40:52 -04:00
Matthew Territo
29fd158ed5 Create BoolProperty for PerformanceComponent 2017-07-07 12:33:49 -06:00
Matthew Territo
810c2ec493 Enable PerformanceManager logging with ImGui checkbox. 2017-07-06 12:07:50 -06:00
Matthew Territo
da3b8052ab Merge remote-tracking branch 'origin/master' into feature/statlogs 2017-07-05 11:33:05 -06:00
Matthew Territo
81164e0d8d Stub for Performance Manager & GUI Button 2017-07-03 13:46:17 -06:00
Alexander Bock
de84bd0761 Fix OpenGL compile error 2017-07-03 11:58:58 -04:00
Alexander Bock
cfdeea31ae Compile fix in Pixelbuffer 2017-07-03 11:20:31 -04:00
Alexander Bock
467a6c3542 Start migrating from GLEW to glbindings
Fix compile errors from wrong function parameters in OpenGL calls
2017-07-03 01:37:53 -04:00
eriksunden
0d05d30396 Feature/packaging (#333)
* Added proper CPACK structure and added generation of openspace.h header to add verisoning information in CMake.

* Packaging(ZIP on Windows, TGZ on UNIX) and installer creation(Windows Only via NSIS) is now working.

* Fixes for packing an archive on OSX.

* Add missing files in packaging
Add install setting to the globebrowsing module to copy required gdal_data
Update Credits

* Updated application icon
2017-07-01 14:04:37 -04:00
Emil Axelsson
4318a2b709 Base orbit update on actual previous values instead of time jump concept. Fix OpenGL invalid value bug caused by negative buffer size. (#346) 2017-07-01 13:31:12 -04:00
Jonathan Bosson
5caf871e06 improve LMA converging ability on zoom cases and limit max iterations to 3k instead of 5k 2017-06-23 15:24:07 -06:00
Alexander Bock
84fff83f22 GCC7 compile fix 2017-06-21 15:42:13 -04:00
Jonathan Bosson
7bb83abe08 constructor looks more clean 2017-06-21 11:31:04 -06:00
Jonathan Bosson
f94d58d738 improvement to tap interpretation by time instead of path size 2017-06-21 11:30:16 -06:00
Alexander Bock
396ecbe5d5 Support new TemporalTileProvider time format 2017-06-21 08:52:12 -04:00
Jonathan Bosson
7f39ebb49c cleanup and commented all code 2017-06-20 15:06:38 -06:00
Jonathan Bosson
ad142580c2 cleanup 2017-06-16 17:57:08 -06:00
Jonathan Bosson
b1be00a0eb added transparency, thickness and color control to the markers 2017-06-14 14:09:54 -06:00
Jonathan Bosson
c53bcaac05 markers working, alpha and textures are not 2017-06-13 13:54:43 -06:00
Jonathan Bosson
5ef64aa513 gl_position is vec4, cleanup/tests 2017-06-09 17:48:07 -06:00