Commit Graph

193 Commits

Author SHA1 Message Date
Emil Axelsson
ea5382c028 Volume conversion and rendering (#350)
Add volume rendering features
 - Improve task runner
 - Improve reading from CDF files
 - Basic time varying volume rendering
 - Fix scaling bug in RenderableToyVolume
2017-09-22 12:03:23 +02:00
Alexander Bock
5ca44d4aa1 Allow RenderableGlobe to have a single radius
Make GlobeBrowsing scene the new default scene
2017-07-27 17:24:22 -04:00
Alexander Bock
e661324002 Remove style guide errors
Add missing newline errors
2017-07-21 11:52:25 -04:00
Alexander Bock
0e9edaeb12 Fix byte order mark commits
Update Ghoul
2017-07-17 15:54:00 -04: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
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
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
2484234651 Reset cfg for ${LOGS} after merge 2017-07-13 11:07:04 -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
Jonathan Bosson
6f4df093a6 no powerwall by default 2017-07-12 12:22:36 -06:00
Jonathan Bosson
76e0e6c59c last merge with master 2017-07-10 18:41:06 -06:00
Alexander Bock
c26fe4b279 Move SGCT config files into main config folder and remove unused transferfunctions 2017-07-08 16:06:45 -04:00
Jonathan Bosson
7f39ebb49c cleanup and commented all code 2017-06-20 15:06:38 -06:00
Alexander Bock
dd95757460 Ooops 2017-06-09 11:46:36 -04:00
Alexander Bock
ec8fc7855f Add OpenGL Debug supression for Intel card GL_LINE_WIDTH warnings 2017-06-09 11:43:43 -04:00
Alexander Bock
9a7eba16bd Remove warnings
Update Ghoul repository
Fix spelling mistake in openspace.cfg
2017-06-08 00:07:51 -04:00
Jonathan Bosson
58c6f17acf fix to duplicate refs 2017-06-07 11:45:55 -06:00
Alexander Bock
c77fdf23ae Add predefined SGCT config for Spout sharing 2017-06-06 09:25:06 -04:00
Jonathan Bosson
776d688899 improved performance by choosing step size more intelligently in gradient of LMA 2017-05-30 16:55:01 -06:00
Matthew Territo
64c94890f4 Add a performance warning (113186) ignore entry for OpenGL Debugger 2017-05-30 10:32:45 -06:00
Jonathan Bosson
4cdd4ed931 Merge fix with master 2017-05-19 12:43:58 -06:00
Matthew Territo
5086d1e5ea Merge branch 'master' into feature/launcherconfigs 2017-05-19 11:41:22 -06:00
Jonathan Bosson
612b207d19 mute mouse input when we have touch input (for feedback on linux) 2017-05-18 19:19:26 -06:00
Emil Axelsson
1eee40887d Tweak animation and appearance of lua console + Remove some duplicate code 2017-05-17 21:21:51 +02:00
Jonathan Bosson
92274563a4 removed finger scaling on zoom/roll, reintroduced roll interpret with all fingers, rescaled sensitivities to fit new method, fix build issue with ghoul_condition 2017-05-17 13:11:15 -06:00
Jonathan Bosson
22dd7f2fb0 fix to GUI toggle with keyboard+touch inconsistency 2017-05-17 11:10:55 -06:00
Jonathan Bosson
3a93825979 fix to XY-axis issue with zoom/roll, change to three-finger-case 2017-05-16 17:15:35 -06:00
Matthew Territo
af953ca4f1 Add Launcher LogLevel to config file. Set to None. 2017-05-12 15:56:39 -06:00
Jonathan Bosson
542e4c0fcb changes during feedback and cleanup 2017-05-12 15:55:20 -06:00
Alexander Bock
d597750398 Some more refactoring of the documentation feature 2017-05-11 13:56:06 -04:00
Jonathan Bosson
08e3ac8a6b put constants into properties instead 2017-05-10 15:09:29 -06:00
Jonathan Bosson
824cd1be05 guiMode infrastructure, just need to emulate mouse correctly 2017-05-04 17:29:30 -06:00
Jonathan Bosson
86d02fc98b Refactor TouchInteraction class (removed unneeded variables/functions and went back to switch-case for interpret() 2017-04-27 12:44:32 -06:00
Jonathan Bosson
b5a058121d put direct-manipulation in its own function, dynamic time step for all but the zoom-DOF 2017-04-25 17:06:46 -06:00
Alexander Bock
d6a4106c93 Feature/spout (#291)
* Add initial Spout implementation

* Some cleanup
2017-04-24 14:45:23 -04:00
Jonathan Bosson
11906b5aaf disable warnings for now 2017-04-24 09:11:01 -06:00
Jonathan Bosson
9e869fb384 merge with master 2017-04-24 08:53:38 -06:00
Jonathan Bosson
0542e7cef5 Levmarq gives right q values, need to transform them to camera space correctly 2017-04-20 15:22:53 -06:00
Alexander Bock
bf16c76add Feature/opengldebug (#290)
* Add InLIstVerifier

* Initial implementation of OpenGL debug messages

* Moving functionality into Ghoul

* Compile fix

* Update Ghoul repository
Make use of the moved OpenGL debug functions

* Update Ghoul to fix GCC and Clang compiler errors

* Add unit test for IntListVerifier
2017-04-18 14:29:23 -04:00
Alexander Bock
c53bbf14be Add property and configuration option to disable the scene tag on a master node (closing #247) 2017-04-17 10:55:37 -04:00
Jonathan Bosson
1c1570e854 defined a function to go from modelview to screen space view, comments on step-by-step method for the direct-touch solution 2017-04-07 11:12:02 -06:00
Jonathan Bosson
4416707931 find traced rays intersection point on boundingsphere for direct touch interaction 2017-04-04 13:36:35 -06:00
Jonathan Bosson
0ea349a70c convert cursor coordinates to ray direction in world space and calculate the distance from planets to the ray to get picking 2017-03-28 14:15:23 -06:00
Jonathan Bosson
bc46190711 invert panning interaction after feedback 2017-03-17 14:43:09 -06:00
Jonathan Bosson
6a6b01096d cleanup of unneeded variables and working version of angle interpretation on roll 2017-03-17 11:29:49 -06:00
Jonathan Bosson
2e3cd2e599 Touch interaction works decently on globebrowsing and newhorizon scenes. Pause globebrowsing to freeze focus nodes orbit 2017-03-16 13:40:29 -06:00