Commit Graph

4526 Commits

Author SHA1 Message Date
Matthew Territo
e53a73f79f Init headers in logging files. Clear logs each time outputLogs is enabled. 2017-07-19 23:15:15 -06:00
Matthew Territo
034bfda71d Create clearLogs() 2017-07-19 19:39:30 -06:00
Matthew Territo
82454c02b8 Convert microseconds to floats instead of duration count 2017-07-19 18:09:02 -06:00
Matthew Territo
8935c9381f Add totalTime tracking in performanceMeasurements 2017-07-19 17:29:21 -06:00
Matthew Territo
e810dcf5b2 Update _performanceRecord to store std::chrono::nanosecond duration instead of bare number 2017-07-19 16:36:18 -06:00
Alexander Bock
51be0629bc Create CODE_OF_CONDUCT.md 2017-07-19 00:57:50 -04:00
Matthew Territo
123f0e9706 Merge pull request #368 from OpenSpace/feature/statlogs
Write remaining PerformanceMeasurement logs on destruction
2017-07-18 14:54:28 -06:00
Matthew Territo
f14af630ed Write remaining PerformanceMeasurement logs on destruction, even when there is
not a multiple of the PerformanceLayout::NumberValues
2017-07-18 14:51:26 -06:00
Matthew Territo
e8f89345aa Merge pull request #367 from OpenSpace/feature/statlogs
Replace spaces with underscores in node names
2017-07-18 10:50:54 -06:00
Matthew Territo
315284c12a Replace spaces with underscores in node names 2017-07-18 10:48:04 -06: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
Kalle Bladin
d4c404b7a0 Merge pull request #364 from OpenSpace/feature/globebrowsing-remove-warnings
Fix compilation warnings.
2017-07-14 23:29:43 +02:00
Kalle Bladin
a232a1a0a7 Fix compilation warnings. 2017-07-14 22:48:32 +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
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
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
Jonathan Bosson
c4e4e141af spaces instead of tabs 2017-07-13 13:09:25 -06:00
Alexander Bock
c3929f5d6d Add the ability to add OpenGL error checking and function call logging though the openspace.cfg file 2017-07-13 14:52:13 -04:00
Alexander Bock
3a0023e45c Automatically set SGCT_SPOUT_SUPPORT when OPENSPACE_SPOUT_SUPPORT is set 2017-07-13 13:42:23 -04:00
Jonathan Bosson
78c301ec8d Merge branch 'master' into feature/multitouch 2017-07-13 11:07:39 -06:00
Matthew Territo
2484234651 Reset cfg for ${LOGS} after merge 2017-07-13 11:07:04 -06:00
Matthew Territo
d65a83dfbc Merge remote-tracking branch 'origin/master' into feature/statlogs
# Conflicts:
#	Jenkinsfile
#	openspace.cfg
2017-07-13 11:05:02 -06:00
Matthew Territo
9f8036fa0e Line endings 2017-07-13 11:00:50 -06:00
Alexander Bock
b09f89f918 Build OpenSpace on Linux Jenkins multithreaded
Remove unused NASM declaration
2017-07-13 12:26:19 -04:00
Alexander Bock
87d25549c1 Fix line ending for Jenkinsfile
Update Ghoul repository
2017-07-13 12:24:23 -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
Matthew Territo
cdb84ac111 Merge remote-tracking branch 'origin/master' into feature/statlogs 2017-07-13 09:06:13 -06:00
Kalle Bladin
6e16466755 Back to LF line endings (#359)
* Auto update line endings to LF in main.cpp and openspaceengine.cpp

* Add .editorconfig

This is a tool that allows you to tell multiple editors what type of code
style and configuration that should be used. It unifies the settings and
makes the risk of running into config-related issues smaller.
2017-07-13 16:49:42 +02:00
Kalle Bladin
ca90faab75 Include globebrowsing module to avoid linking errors. (#360) 2017-07-13 13:31:27 +02:00
Matthew Territo
895f0acbdc Move logs into ${LOGS} directory 2017-07-12 19:33:01 -06:00
Alexander Bock
2fc28043a1 Merge remote-tracking branch 'origin/master' 2017-07-12 16:57:01 -04:00
Alexander Bock
3f445a1c4c Update Ghoul repository 2017-07-12 16:56:51 -04:00
Alexander Bock
520b057755 Create .gitattributes 2017-07-12 16:55:54 -04:00
Jonathan Bosson
d8b0800488 Merge branch 'master' into feature/multitouch 2017-07-12 12:46:18 -06:00