4cdd4ed931
Merge fix with master
2017-05-19 12:43:58 -06:00
612b207d19
mute mouse input when we have touch input (for feedback on linux)
2017-05-18 19:19:26 -06:00
1eee40887d
Tweak animation and appearance of lua console + Remove some duplicate code
2017-05-17 21:21:51 +02:00
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
22dd7f2fb0
fix to GUI toggle with keyboard+touch inconsistency
2017-05-17 11:10:55 -06:00
3a93825979
fix to XY-axis issue with zoom/roll, change to three-finger-case
2017-05-16 17:15:35 -06:00
542e4c0fcb
changes during feedback and cleanup
2017-05-12 15:55:20 -06:00
d597750398
Some more refactoring of the documentation feature
2017-05-11 13:56:06 -04:00
08e3ac8a6b
put constants into properties instead
2017-05-10 15:09:29 -06:00
824cd1be05
guiMode infrastructure, just need to emulate mouse correctly
2017-05-04 17:29:30 -06:00
86d02fc98b
Refactor TouchInteraction class (removed unneeded variables/functions and went back to switch-case for interpret()
2017-04-27 12:44:32 -06:00
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
d6a4106c93
Feature/spout ( #291 )
...
* Add initial Spout implementation
* Some cleanup
2017-04-24 14:45:23 -04:00
11906b5aaf
disable warnings for now
2017-04-24 09:11:01 -06:00
9e869fb384
merge with master
2017-04-24 08:53:38 -06:00
0542e7cef5
Levmarq gives right q values, need to transform them to camera space correctly
2017-04-20 15:22:53 -06:00
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
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
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
4416707931
find traced rays intersection point on boundingsphere for direct touch interaction
2017-04-04 13:36:35 -06:00
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
bc46190711
invert panning interaction after feedback
2017-03-17 14:43:09 -06:00
6a6b01096d
cleanup of unneeded variables and working version of angle interpretation on roll
2017-03-17 11:29:49 -06:00
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
b66d1f32c4
merge with develop
2017-03-14 16:39:15 -06:00
0cdceddeee
Rename None to Hidden, to avoid collision with X11 and reset data path
2017-03-06 10:33:30 +01:00
8e0a37fb7a
Compile fixes related to change in documentation namespace
...
Configuration fix, making the default scene default again
2017-03-03 17:51:39 -05:00
4a2d70b88d
merge with develop for jenkins build messages
2017-03-03 12:10:41 -07:00
4b8111439c
merge with develop
2017-03-02 15:49:54 -07:00
cb7e81cf3d
Add support for converting and rendering volumetric data in the cdf format. Replace DataConverter by a more general purpose TaskRunner.
...
Conflicts:
modules/volume/CMakeLists.txt
modules/volume/linearlrucache.h
src/engine/openspaceengine.cpp
2017-03-02 18:20:01 +01:00
55f002ad6f
Move the disabling of the rendering on the master into the RenderEngine
...
instead of specifying it in the OpenSpaceEngine
2017-03-01 10:39:29 -05:00
4f64cbb141
First step of main.cpp cleanup
...
Updated SGCT repository
2017-02-25 10:59:59 -05:00
87f5654bf8
Feature/openvr ( #180 )
...
* Updated SGCT to latest commit, to include OpenVR convenience functions.
* Made OpenSpace application support OpenVR. Check CMake option "OPENSPACE_OPENVR_SUPPORT" to enable this functionality.
* Merged latest SGCT to remove ogl_header dependency in SGCTOpenVR header
* Merged latest SGCT with minor Mac gl/glew include fix for including SGCTOpenVR as it relies on inclusion of gl headers.
* CMake fix in OpenSpace app for resetting variables after unchecking OPENVR_SUPPORT.
* Created separate SGCT config files for Oculus Rift and HTC Vive HMD
* Update Ghoul to enable experimental GLM features
* Update SGCT repository
* Updated to latest SGCT version for latest fixes.
2017-02-24 20:41:40 -05:00
85c3de9152
Feature/modular sgct config ( #239 )
...
* Initial work to create SGCT configuration files from Lua
* More work on modularizing the SGCT configs
- Removing almost all pregenerated config files
- Working functions to create configurations with single and fisheye
rendering viewports
* Some more work on modular SGCT configurations
- Make more objects configurable
- Add documentation
- Make use of new `sgct.config.single` and `sgct.config.fisheye` functions
* Fix accidental commit
* Enable single configuration as default
* Do not remove single_fisheye.xml for inspiration
* Update single_fisheye.xml
* Update configuration_helper.lua
* Place multiview and multinode configuration files back
2017-02-22 15:35:55 -05:00
5e84b7f6a2
new touch module with TUIO library to make OpenSpace tuio-aware
2017-02-16 12:52:39 -07:00
729bffb0f9
Improve SpecificationError reporting
...
Fix spelling error in ModuleEngine
2017-02-14 18:11:20 -05:00
b3be4180de
Clean data/scene folder; remove lodesritest and restructure lodglobes folders
...
Fix various issues in mod files
Remove backslash from file paths in StringProperty
2016-12-09 10:21:17 +01:00
dc3ded891b
Started with code cleanup of Globebrowsing
2016-12-04 10:34:25 +01:00
0db02995bd
Update Ghoul repository
2016-11-08 13:30:11 +01:00
70af0f0073
Add an option to the configuration manager to append the scene name to the cache directory (closing #159 )
2016-11-07 13:39:01 +01:00
329986c0c6
Merge branch 'develop' into feature/globebrowsing
...
Conflicts:
modules/base/scale/staticscale.cpp
modules/base/scale/staticscale.h
modules/globebrowsing/meshes/trianglesoup.h
modules/globebrowsing/tile/tiledataset.cpp
modules/newhorizons/shaders/renderableModelProjection_fs.glsl
src/interaction/interactionhandler.cpp
src/rendering/renderengine.cpp
src/scene/scenegraphnode.cpp
2016-09-20 15:52:01 +02:00
7235df2fe3
Place ScriptLog file in base directory
2016-09-20 10:12:53 +02:00
a25a9b4a2d
Add the ability to the FactoryManager to write documentation about all registered classes
...
Enable this feature on default in openspace.cfg
Move all generated documentations into a documentation folder
Adapt gitignore accordingly
2016-09-16 17:37:02 +02:00
17a65e3816
Writing general Documentation as HTML
...
Add HTML to gitignore
Set default documentation to HTML
2016-09-16 11:56:15 +02:00
408280a533
Rearrange and rename constants in ConfigurationManager
...
Make use of constants in ConfigurationManager documentation
2016-09-15 17:58:31 +02:00
ae65b8f306
Clean up globe browsing module files.
2016-09-14 21:17:26 -04:00
a02c5714c4
Use html instead of HTML for logging
2016-09-14 16:44:48 +02:00
c20cd80eaa
Merge globebrowsing, resolve conflicts
...
Reduce SizeReference font size - TextureAtlas threw InvalidRegionException
Use Mars and Earth Barycenter and not center of mass
Use name Mars instead of LodMars, same for Earth
Move init of font manager to be done prior to scene init
Debug log what modules are added
Debug log when creating SceneGraphNode from dictionary
2016-09-07 17:37:27 -04:00
16b79759b9
Don't flush log immediately
2016-09-03 18:09:55 -04:00
b5b6b38dce
Use globe browsing scene
2016-08-30 19:24:49 -04:00
Jonathan Bosson