Commit Graph

2043 Commits

Author SHA1 Message Date
Matthew Territo
6f65641290 Merge branch 'master' into feature/multiresvolume
* master: (44 commits)
  Remove style guide errors Add missing newline errors
  Update the Sun glare reference
  Update OpenSpace version
  Minor spelling, grammar, & comment cleanup
  Cleanup of gitignore file Started work on fixing Rosetta
  Jenkins compile fix
  Touch module capitalization compile fix
  Fix capitalization of includes
  More shader cleanup Remove dedicated logs folder Change openspaceengine to create logs folder automatically
  Renaming touch include files
  Jenkins compile fix
  Cleanup of shader code
  Jenkins compile fix
  Jenkins compile error
  Jenkins compile fix Remove fresh recompile
  Update Jenkinsfile to clean workspace
  Cleanup copyright information in shaders
  Second part of turning touch classes to lower case
  First step of turning touch classes into lower case
  Replacing void Renderable::render(const RenderData&) with Renderable::render(const RenderData&, RendererTasks&)
  ...

# Conflicts:
#	modules/multiresvolume/rendering/localtfbrickselector.cpp
#	modules/multiresvolume/rendering/localtfbrickselector.h
#	modules/multiresvolume/rendering/renderablemultiresvolume.cpp
#	modules/multiresvolume/rendering/renderablemultiresvolume.h
#	modules/multiresvolume/rendering/shenbrickselector.h
#	modules/multiresvolume/rendering/simpletfbrickselector.cpp
#	modules/multiresvolume/rendering/simpletfbrickselector.h
#	modules/multiresvolume/rendering/tfbrickselector.cpp
#	modules/multiresvolume/rendering/tfbrickselector.h
#	modules/multiresvolume/rendering/tsp.cpp
#	src/performance/performancemanager.cpp
2017-07-24 11:54:50 -06:00
Alexander Bock
e661324002 Remove style guide errors
Add missing newline errors
2017-07-21 11:52:25 -04:00
Alexander Bock
2d298b3c75 Merge branch 'master' into misc/cleanup 2017-07-21 09:37:19 -04:00
Matthew Territo
be0ce22270 Merge branch 'feature/statlogs' into feature/multiresvolume 2017-07-20 11:46:26 -06:00
Matthew Territo
e6c9803dcc Add updateSceneGraphNode measurement 2017-07-20 11:42:14 -06:00
Matthew Territo
ae46bc54c2 Make sure to flush GL pipeline measuring SceneGraphNode::update 2017-07-20 11:01:05 -06:00
Matthew Territo
40599081d9 Minor spelling, grammar, & comment cleanup 2017-07-19 23:34:48 -06:00
Matthew Territo
9417c9ec13 Merge branch 'feature/statlogs' into feature/multiresvolume
* feature/statlogs:
  Init headers in logging files. Clear logs each time outputLogs is enabled.
  Create clearLogs()
2017-07-19 23:16:10 -06:00
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
31c19ec3ef Merge branch 'feature/statlogs' into feature/multiresvolume 2017-07-19 18:10:35 -06:00
Matthew Territo
82454c02b8 Convert microseconds to floats instead of duration count 2017-07-19 18:09:02 -06:00
Matthew Territo
958e020538 Merge branch 'feature/statlogs' into feature/multiresvolume 2017-07-19 17:30:51 -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
77b15724b5 More shader cleanup
Remove dedicated logs folder
Change openspaceengine to create logs folder automatically
2017-07-19 15:44:30 -04:00
Alexander Bock
3469d19de7 Jenkins compile fix 2017-07-19 01:28:30 -04:00
Matthew Territo
6d560da987 Merge branch 'master' into feature/multiresvolume
* master:
  Write remaining PerformanceMeasurement logs on destruction, even when there is not a multiple of the PerformanceLayout::NumberValues
2017-07-18 14:55:15 -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
Alexander Bock
008ab4e613 Replacing void Renderable::render(const RenderData&) with Renderable::render(const RenderData&, RendererTasks&) 2017-07-18 15:47:48 -04:00
Matthew Territo
00f18282cb Merge commit 'e8f89345aaedf24e583d5fc915a945ef7763b2d2' into feature/multiresvolume
* commit 'e8f89345aaedf24e583d5fc915a945ef7763b2d2':
  Replace spaces with underscores in node names
2017-07-18 10:52:45 -06:00
Matthew Territo
315284c12a Replace spaces with underscores in node names 2017-07-18 10:48:04 -06:00
Alexander Bock
0963184293 Removing more warnings 2017-07-18 01:05:59 -04:00
Alexander Bock
7737b082d9 Removing more warnings 2017-07-17 18:03:37 -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
4dba552fd1 Started switching OpenSpace projects to nested namespaces
Various cleanups
2017-07-15 20:01:55 -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
ec6641038d Make use of C++17 features in LuaConsole and filesystem walking 2017-07-15 14:37:00 -04: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
Alexander Bock
6a198c5d93 Started some warning cleanup 2017-07-14 14:21:01 -04:00
Matthew Territo
e0314a1906 Merge remote-tracking branch 'origin/master' into feature/multiresvolume 2017-07-14 09:21:13 -06: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
Matthew Territo
406e892fab Merge branch 'master' into feature/multiresvolume
* master: (152 commits)
  Alex's recommended changes in pull #357. Add check for log directory existence and creation
  build fix, cannot bind non-const lvalue reference
  changes from PR comments
  Fix config file. Merge.
  build fix by using new path to lib and adding CMake include paths
  link to right directory for ext lib CMakeLists
  nitpicky no new line in for url
  update libTUIO11 submodule
  libTUIO11 as submodule
  remove old libTUIO
  use libTUIO as submodule
  spaces instead of tabs
  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
  no powerwall by default
  make touchmarkers render on render callback over postdraw
  build fix due to lua URL change
  std on all algorithms
  limit finger input to LMA to 3 (makes it easier to converge on 3+ cases)
  improve LMA converging ability on zoom cases and limit max iterations to 3k instead of 5k
  ...

# Conflicts:
#	Jenkinsfile
#	openspace.cfg
2017-07-13 23:23:50 -06: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
d9fa55581f changes from PR comments 2017-07-13 20:10:35 -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
c4e4e141af spaces instead of tabs 2017-07-13 13:09:25 -06:00
Matthew Territo
dd17fe9075 Merge branch 'feature/researchkit' into feature/multiresvolume 2017-07-13 12:55:45 -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
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
Matthew Territo
5a93706fae Line ending problem 2017-07-13 10:56:10 -06:00
Matthew Territo
e28d34faad Merge remote-tracking branch 'origin/master' into feature/researchkit
# Conflicts:
#	Jenkinsfile
#	openspace.cfg
2017-07-13 10:53:34 -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
4cc7c69827 Merge remote-tracking branch 'origin/master' into feature/multiresvolume 2017-07-13 09:07:13 -06:00
Matthew Territo
cdb84ac111 Merge remote-tracking branch 'origin/master' into feature/statlogs 2017-07-13 09:06:13 -06:00