Commit Graph

309 Commits

Author SHA1 Message Date
Alexander Bock
d86b78f2f5 Address PR comments 2018-07-05 09:47:35 -04:00
Alexander Bock
99a6efca8e Declare PropertyInfo as constexpr, rather than const 2018-06-28 17:08:56 -04:00
Alexander Bock
4952f8f977 Code cleanup branch (#618)
* Make height map fallback layer work again
  * Add documentation to joystick button bindings
  * Removed grouped property headers
  * Add new version number constant generated by CMake
  * Make Joystick deadzone work properly
  * Change the startup date on Earth to today
  * Fix key modifier handling
  * Add debugging indices for TreeNodeDebugging
  * Fix script schedule for OsirisRex
  * Do not open Mission schedule automatically
  * Upload default projection texture automatically

  * General code cleanup
  * Fix check_style_guide warnings
  * Remove .clang-format
  * MacOS compile fixes
  * Clang analyzer fixes
2018-06-10 04:47:34 +00:00
GPayne
305ae9d8fb Merge with master branch 2018-05-15 13:56:17 -06:00
GPayne
e31e80d851 Make lower-right corner double tap zoom-out a non-optional feature 2018-05-14 15:03:47 -06:00
GPayne
a767c2fd08 Fixed some touch behavior (especially zoom) and implemented lower-right corner double-tap for zooming out 2018-05-08 16:44:53 -06:00
GPayne
d686212b35 Added asymmetrical zooming to try for more balance between zooming in vs. out 2018-05-07 16:06:21 -06:00
GPayne
1d5298660b Modified control of gesture sensitivity settings to improve feel of interaction, fixed roll decay bug 2018-05-07 16:06:21 -06:00
GPayne
0e9dc1eff8 Fixed numerical error in touch interaction 2018-05-07 16:06:13 -06:00
Alexander Bock
db66084ad8 Fix warnings and coding style issues 2018-04-21 08:27:20 -04:00
GPayne
442817e9d0 Implemented velocity ceiling with nonlinear behavior with focus node distance 2018-04-20 16:07:23 -06:00
Alexander Bock
4041bbb935 Cleanup (#600)
* General Code Cleanup
 * Add check for TABs to check_style_guide.py
 * Removing warnings
2018-04-19 13:27:15 -04:00
GPayne
86534b7a17 Merged-in master branch 2018-04-11 12:24:27 -06:00
GPayne
dbb0915417 Working constant-time touch interaction decay. Needs a speed limit when close to camera focus node. 2018-04-11 11:40:40 -06:00
Alexander Bock
40dbf875c5 Issue/525 (#593)
* Add initializeGL and deinitializeGL methods to OpenSpaceModule Call releaseAll from ProgramObjectManager in deinitializeGL to guard against errors when deinitializing assets

* Change removeProgramObject function in RenderEngine to take a non-owning pointer instead of a reference to a unique pointer to make it compatible with the ProgramObjectManager
Update Ghoul repository

* Using ProgramObjectManager in more modules to reduce the number of programs compiled at startup
2018-04-10 15:55:52 -04:00
Gene Payne
5380636932 Update of touch table interface code (#561)
* Version of touch interface for user study that has disabled panning and limited zoom to prevent zooming through the planet surface

* Update starlabels.data file

* Enable minimum picking distance in NDC

* Fix stack corruption bug in TouchMarker

* Version of touch interface for user study that has disabled panning and limited zoom to prevent zooming through the planet surface

* Fix stack corruption bug in TouchMarker

* Add time limit to levmarq solver

* Add debug properties to touch GUI with a compile time flag

* Guard against accessing outside bounds

* Added exponential zoom for faster zoom with increased distance from focus node

* Refined the exponential zoom for better behavior on the touch table

* Added properties for disabling panning and node boundary sphere multiplier for zoom

* Added more debug logging and stopped using camera focusNode (looks deprecated) for distance calculation

* Found error in the deceleration algorithm

* Default-disable debug logging, exponential zoom coeff change and additional debug log statement
2018-03-20 10:25:28 -04:00
GPayne
97ef55b4be Default-disable debug logging, exponential zoom coeff change and additional debug log statement 2018-03-16 12:39:39 -06:00
GPayne
cf3a3d6e63 Found error in the deceleration algorithm 2018-03-16 12:16:07 -06:00
GPayne
eba52193c4 Added more debug logging and stopped using camera focusNode (looks deprecated) for distance calculation 2018-03-16 12:12:01 -06:00
Alexander Bock
db7ae7e384 Issue/453 (#556)
* Introduced guiName to PropertyOwner
  * Added requirement that PropertyOwner::identifier may not contain whitespaces
  * Changed Name to Identifier in asset and scene files
  * Added new PropertyOwner to RenderEngine that owns the ScreenSpaceRenderables
  * Moved Name and GuiPath into GUI group
  * Added user-facing names to layer groups
2018-03-16 09:21:29 -04:00
Alexander Bock
f38c26eff0 Remove warnings 2018-03-12 22:31:01 +01:00
Alexander Bock
7ccb42545c Remove Clang warnings 2018-03-08 20:18:18 +01:00
Alexander Bock
a3c849843f Feature/new formatting (#547)
* Change to new logging format (closes #542)
 * Adds a screenshots folder that uses the application startup time
 * Creating focus nodes for VRT files if the info files contain location information
 * Fix issue with removing virtual properties
 * Add a method for returning the cartesian coordinates for a geolocation on a planet
2018-03-07 18:10:32 -05:00
GPayne
237db975fe Added properties for disabling panning and node boundary sphere multiplier for zoom 2018-02-26 14:55:26 -07:00
GPayne
142702bbea Refined the exponential zoom for better behavior on the touch table 2018-02-23 13:14:25 -07:00
GPayne
40bf64fe70 Added exponential zoom for faster zoom with increased distance from focus node 2018-02-17 19:56:36 -07:00
GPayne
9b8aaef1fb Merge master into touch study branch 2018-01-18 15:52:48 -07:00
Alexander Bock
47233b8e6f Make use of UniformCache in many Renderables and switch from setUniform(const std::string&, ...) to setUniform(GLint, ...) in those cases 2017-12-31 17:31:10 -05:00
Alexander Bock
6089449bba Fix crash with MSAA buffer generation when compiling in Debug on Windows
Cleanup of logging behavior
2017-12-30 20:24:05 -05:00
Alexander Bock
dcfef3557f Update copyright header 2017-12-29 20:11:22 +01:00
Emil Axelsson
d40d2abc9a Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-12-19 12:56:12 +01:00
Alexander Bock
0b0ad54028 Reenable digital universe on default
Fix refresh rate setting in configuration_helper
2017-12-18 11:58:22 -05:00
Emil Axelsson
d4278f9adc Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management 2017-12-17 18:30:00 +01:00
Emil Axelsson
75cf6dcf71 Asset work in progress 2017-12-15 13:21:10 +01:00
Alexander Bock
23a446cb2c Update Ghoul repository
Adapt to changes that absPath is not called automatically as often anymore
Remove atmosphereearth.scene
2017-12-13 21:55:29 -05:00
Alexander Bock
a08c678bb0 Remove erraneous enabled OpenGL checking code
Remove warnings
Reset using the star glare texture as billboard for the Sun
2017-12-12 13:07:56 -05:00
Alexander Bock
a631b7e0a3 Making most logger categories constexpr 2017-12-11 23:46:34 -05:00
Alexander Bock
38338725b9 Strict coding style adherence 2017-11-26 14:57:26 -05:00
Alexander Bock
719130b6b7 Jenkinswarnings (#419)
* Remove more warnings

* Removing more warnings

* More warning fixes

* More warnings

* More warnings

* Update ghoul
2017-11-16 21:19:28 -05:00
Alexander Bock
3a7f221793 Remove GCC warnings 2017-11-13 16:22:07 -05:00
Alexander Bock
758e26789c More coding style conformance 2017-11-11 11:25:49 -05:00
Alexander Bock
afa1d6d33e Add strict test for whitespace at end of line
More work on coding style
2017-11-09 23:47:51 -05:00
Alexander Bock
fc048cd455 Merge branch 'master' into touch-user-study
# Conflicts:
#	modules/touch/include/touchmarker.h
#	modules/touch/src/touchinteraction.cpp
#	modules/touch/src/touchmarker.cpp
2017-11-09 10:30:45 -05:00
Alexander Bock
b50b52d351 Cleanup for coding style
Add strict mode to check_style_guide script
2017-11-08 10:35:39 -06:00
Emil Axelsson
16efa28470 Guard against accessing outside bounds 2017-11-03 15:48:00 +01:00
Emil Axelsson
aa63ec68b0 Add debug properties to touch GUI with a compile time flag 2017-11-03 11:28:39 +01:00
Emil Axelsson
b4b85ae36b Add time limit to levmarq solver 2017-11-02 20:50:56 +01:00
Emil Axelsson
2c486ac38b Fix stack corruption bug in TouchMarker 2017-11-02 20:50:56 +01:00
GPayne
ad1a4a21fb Version of touch interface for user study that has disabled panning and limited zoom to prevent zooming through the planet surface 2017-11-02 20:50:56 +01:00
Alexander Bock
ca69408366 Enable minimum picking distance in NDC 2017-11-02 12:05:09 -04:00