Commit Graph

4646 Commits

Author SHA1 Message Date
Alexander Bock 40926aa68f Remove <any> include 2017-07-17 16:19:26 -04:00
Alexander Bock 631f53ed2d Append a check for UTF-8 BOM to the check_style_guide.py
Add a script to remove a BOM
2017-07-17 15:58:13 -04:00
Alexander Bock 0e9edaeb12 Fix byte order mark commits
Update Ghoul
2017-07-17 15:54:00 -04:00
Alexander Bock 90e0364c5a Revert to using ghoul::any due to lack of support on macOS 2017-07-17 13:46:35 -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 4dba552fd1 Started switching OpenSpace projects to nested namespaces
Various cleanups
2017-07-15 20:01:55 -04:00
Alexander Bock 9d4215695d Update Ghoul 2017-07-15 18:36:01 -04:00
Alexander Bock 3b1c2b37a0 Update ghoul repository
Adapt to the change from ghoul::any to std::any
2017-07-15 18:13:52 -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 93cb8a98da Set correct compiler flags for OpenSpaceTest 2017-07-15 16:12:49 -04:00
Alexander Bock 9401579cc0 Jenkins compile fix by specifying compile settings for applications 2017-07-15 15:53:45 -04:00
Alexander Bock 469140f4f0 C++17 nested namespace test 2017-07-15 15:37:42 -04:00
Alexander Bock ec6641038d Make use of C++17 features in LuaConsole and filesystem walking 2017-07-15 14:37:00 -04:00
Alexander Bock 00e684f7dc Merge remote-tracking branch 'origin/master' into misc/cleanup
# Conflicts:
#	data/scene/default.scene
#	modules/globebrowsing/globes/pointglobe.cpp
#	modules/globebrowsing/tile/rawtiledatareader/tiledatatype.cpp
2017-07-15 13:22:46 -04:00
Matthew Territo 9b924c3d97 Merge pull request #366 from OpenSpace/issue365
set openspace.navigation.resetCameraDirection()
2017-07-14 22:00:14 -06:00
Matthew Territo 0dc96c3bc8 default, osirisrex, & satellites 2017-07-14 18:22:02 -06:00
Alexander Bock 35636890da Various fixes for the New Horizons scene
- Fix transparency issue making the New Horizons module invisible
  - Fix the offsets of the instruments on board New Horizons
  - Fix the missing projections occurred by switching the radius specifications from PSC to regular coordinates
  - Update the accurate kernel usage
2017-07-14 18:53:40 -04:00
Alexander Bock 99b5d09fc2 Update Ghoul repository 2017-07-14 17:47:08 -04:00
Kalle Bladin d4c404b7a0 Merge pull request #364 from OpenSpace/feature/globebrowsing-remove-warnings
Fix compilation warnings.
2017-07-14 23:29:43 +02:00
Alexander Bock 6f524f4a67 Add centralized escaping of JSON strings
Enable correct escaping of " character thus removing the need to outlaw "s in comments
2017-07-14 16:58:18 -04:00
Alexander Bock 88b8789336 Add recursion for TableVerifiers to check whether a documentation contains an illegal " character
Fix Configurationmanager documentation to remove " character
2017-07-14 16:49:03 -04:00
Kalle Bladin a232a1a0a7 Fix compilation warnings. 2017-07-14 22:48:32 +02:00
Alexander Bock 0a93fa64c4 Remove non-existing resetCameraDirection 2017-07-14 16:02:19 -04:00
Alexander Bock 6a198c5d93 Started some warning cleanup 2017-07-14 14:21:01 -04:00
Kalle Bladin 1457301e1d Merge branch 'master' into feature/globe-generalization 2017-07-14 17:19:37 +02: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
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
Kalle Bladin 0a0942307c Fix y axis flip issue. 2017-07-14 10:58:50 +02:00
Jonathan Bosson 2f52ceb2f9 Merge pull request #358 from OpenSpace/feature/multitouch
Feature/multitouch
2017-07-13 21:30:28 -06:00
Jonathan Bosson fd7971c1ed Merge branch 'master' into feature/multitouch 2017-07-13 21:02:43 -06:00
Matthew Territo 3ca71107e5 Merge pull request #357 from OpenSpace/feature/statlogs
[feature/statlogs] Logging Performance Measurements
Initial implementation for outputting performance measurements to logs
2017-07-13 20:40:45 -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
Matthew Territo 135b1af324 Fix config file. Merge. 2017-07-13 18:24:49 -06:00
Matthew Territo b4c128306f Merge branch 'master' into feature/statlogs
* master:
  Add the ability to add OpenGL error checking and function call logging though the openspace.cfg file
  Automatically set SGCT_SPOUT_SUPPORT when OPENSPACE_SPOUT_SUPPORT is set
2017-07-13 18:16:23 -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
Kalle Bladin f2d7c9c754 Update maxChunkLevel function 2017-07-14 00:46:39 +02:00
Kalle Bladin 42ff93c4da Add fallback texture for Mars 2017-07-14 00:26:01 +02:00
Kalle Bladin e825d3b736 Correct type reinterpretation 2017-07-14 00:09:44 +02:00
Jonathan Bosson 1ae47f202d Merge branch 'feature/multitouch' of https://github.com/OpenSpace/OpenSpace into feature/multitouch 2017-07-13 16:05:03 -06:00
Jonathan Bosson 784343a731 link to right directory for ext lib CMakeLists 2017-07-13 16:04:37 -06:00
Jonathan Bosson 3d5a0df332 nitpicky no new line in for url 2017-07-13 16:00:53 -06:00
Jonathan Bosson ed15412bce update libTUIO11 submodule 2017-07-13 15:53:35 -06:00
Jonathan Bosson 53f6f92de0 libTUIO11 as submodule 2017-07-13 15:52:02 -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
Kalle Bladin 28a6365aa2 Add the ability to have fallback textures 2017-07-13 23:49:39 +02:00
Kalle Bladin c22d1e3df4 SimpleRawTileDataReader can now read all image sizes 2017-07-13 22:14:29 +02:00