Commit Graph

2047 Commits

Author SHA1 Message Date
Matthew Territo
022666f8b8 Misnamed member variable: "tf" to "_transferFunction" 2017-07-24 12:41:32 -06:00
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
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
40599081d9 Minor spelling, grammar, & comment cleanup 2017-07-19 23:34:48 -06:00
Alexander Bock
36e97f1f62 Cleanup of gitignore file
Started work on fixing Rosetta
2017-07-19 22:05:12 -04:00
Alexander Bock
4b3037144f Jenkins compile fix 2017-07-19 21:19:39 -04: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
Alexander Bock
d571970487 Touch module capitalization compile fix 2017-07-19 19:01:10 -04:00
Alexander Bock
669af35b6b Fix capitalization of includes 2017-07-19 16:42:26 -04: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
d246f8fb58 Renaming touch include files 2017-07-19 11:01:02 -04:00
Alexander Bock
88265a469d Cleanup of shader code 2017-07-19 01:27:01 -04:00
Alexander Bock
0647bde8bd Jenkins compile fix 2017-07-18 18:27:30 -04:00
Alexander Bock
cb53e7f3df Jenkins compile error 2017-07-18 18:17:11 -04:00
Alexander Bock
5cf85bfd44 Jenkins compile fix
Remove fresh recompile
2017-07-18 17:59:20 -04:00
Alexander Bock
e7b08e1e25 Cleanup copyright information in shaders 2017-07-18 16:24:57 -04:00
Alexander Bock
4cc6e11f68 Second part of turning touch classes to lower case 2017-07-18 15:53:04 -04:00
Alexander Bock
a1505422d2 First step of turning touch classes into lower case 2017-07-18 15:52:26 -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
5a921525d9 Add missing json.h file that removes warnings 2017-07-17 23:03:32 -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
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
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
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
c5390742e2 Merge remote-tracking branch 'origin/master' into feature/multiresvolume 2017-07-14 18:11:56 -06:00
Matthew Territo
c60dcbb682 Smart Pointers. Is this slower? Probably not. 2017-07-14 18:09:03 -06:00
Matthew Territo
156a72b62b Fix ShenSelector initialization. Return to using read-only mapped_file_source. TSP & RenderableMultiresVolume cleanup. 2017-07-14 17:42:57 -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
Kalle Bladin
a232a1a0a7 Fix compilation warnings. 2017-07-14 22:48:32 +02: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
a9a42bb2cf Merge remote-tracking branch 'origin/master' into feature/multiresvolume 2017-07-14 09:14:32 -06: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
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
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
Matthew Territo
a4d0a58eab Redoing file management for TSP. Not thread safe? 2017-07-13 16:24:16 -06:00