Commit Graph

287 Commits

Author SHA1 Message Date
Kalle Bladin e0814a23dd The ellipsoid of a globe is used to determine how to move the camera in a new interaction mode. 2016-05-26 18:56:36 -04:00
Kalle Bladin fc57b1c770 Solve merge conflict. 2016-05-25 21:35:14 -04:00
Kalle Bladin eed5885f25 Improve interaction. 2016-05-25 21:32:03 -04:00
Kalle Bladin 601f86ae78 Solve bug for when tilting the camera. 2016-05-25 18:50:06 -04:00
Kalle Bladin 3925c30b43 Change size in boundingbox for the globe and the texture and patch size. 2016-05-25 18:03:13 -04:00
Kalle Bladin 221958dc4d Merge branch 'feature/interaction' into feature/globebrowsing 2016-05-25 16:37:20 -04:00
Kalle Bladin 6dbbf16a41 Movement speed is dependent on distance to bounding sphere. 2016-05-25 16:28:41 -04:00
Kalle Bladin 8ab0a70886 Solve merge conflict for interaction. 2016-05-25 13:20:12 -04:00
Kalle Bladin d5d59302e2 Update interaction 2016-05-24 22:50:42 -04:00
Kalle Bladin f2c7a826b3 Smooth movements using delay. 2016-05-24 19:34:57 -04:00
Kalle Bladin 54a824e667 Some basic orbital interaction via mouse control. 2016-05-24 18:30:41 -04:00
Kalle Bladin 09ca260778 Rotating with orbital interaction mode. 2016-05-24 13:26:07 -04:00
Kalle Bladin f438535579 Add classes that are not yet used. 2016-05-23 13:02:24 -04:00
Kalle Bladin 9d235f42b2 Remove old parts of the interface to interaction handler. 2016-05-20 18:50:11 -04:00
Kalle Bladin c2ef5cca58 Remove all implementation from the interaction handler class. Interface is still the same. 2016-05-20 17:39:32 -04:00
Kalle Bladin dcd00e77d0 Minor structural changes in interaction handler. 2016-05-20 16:03:30 -04:00
Kalle Bladin 1db9f2f60c Clean up camera class. 2016-05-19 23:21:48 -04:00
Kalle Bladin 9dda48d44b Remove functions setViewRotationMatrix and compileViewRotationMatrix from camera class. 2016-05-19 12:22:55 -04:00
Erik Broberg ce67314065 Naive and simple distance dependent interaction speed. Useful for debugging 2016-05-17 18:22:57 -04:00
Kalle Bladin 04a363bab1 Merge branch 'develop' into feature/globebrowsing 2016-05-04 15:57:44 -04:00
Alexander Bock b4fa20bfaa Changing interaction handler to have a default inverted roll
Updated Ghoul
2016-04-30 13:16:41 +02:00
Alexander Bock b46f40030b Untabify more files 2016-04-27 14:24:58 +02:00
Erik Broberg 4073f4e6cb Merged in branch develop to feature/globebrowsing 2016-04-18 20:02:42 -04:00
Alexander Bock 906470f28e Untabify the rest of the source files
Update Ghoul repository
2016-04-18 20:14:29 +02:00
Alexander Bock 4936a4a084 Remove sgct.h inclusion from LuaConsole
Untabify more files
2016-04-18 11:12:12 +02:00
Erik Broberg 299cd27f2c Fixed bug Camera (view rot matrix had translation components) and structured Camera code 2016-04-14 12:47:12 -04:00
Alexander Bock 352e7283d6 Enable the usage of modifiers in bindKey calls (closing #158) 2016-04-08 18:03:09 +02:00
Alexander Bock 8d3c667ada Untabify InteractionHandler files 2016-04-08 15:13:21 +02:00
Alexander Bock df0d0d1258 Update Ghoul version to accommodate public API bool parameter changes 2016-03-06 08:08:06 +01:00
Alexander Bock 794bbcedda Fix more GLM degrees->radians changes 2016-02-05 22:48:49 +01:00
Alexander Bock 72eb4dc6fd Make autocompletion of LuaConsole work 2016-02-05 18:47:57 +01:00
Alexander Bock 32cd2d69b9 Make autocompletion of LuaConsole not crash 2016-02-05 18:19:06 +01:00
Alexander Bock 877a4d1ba6 Updated copyright header 2016-02-05 17:43:21 +01:00
Alexander Bock abffcf4175 Allow the camera to get closer to objects 2016-01-31 16:47:36 +01:00
Alexander Bock c7cc137da9 Started cleanup of LuaConsole 2016-01-03 11:27:50 -05:00
Alexander Bock 177571195c Completely remove references to constants.h 2015-12-14 17:36:15 -08:00
Alexander Bock c92fc923f9 Remove constants.h file
Reenable LuaConsole rendering
2015-12-14 17:21:22 -08:00
Alexander Bock e26f1d41a4 Updated Ghoul version
Started cleaning up OpenSpace
2015-12-13 22:01:42 -08:00
Alexander Bock cd3a819541 Updating Ghoul version
Applying new Ghoul changes
2015-12-09 14:41:50 -05:00
Alexander Bock 3806318b0d Applied Ghoul cleanups 2015-11-22 21:26:02 -05:00
Alexander Bock 390f5be4a8 Removing includes of sgct.h 2015-10-26 16:14:38 -05:00
Alexander Bock 20861d68ad Changing WindowWrapper from pointer to reference 2015-10-26 15:10:15 -05:00
Alexander Bock f3fd055db8 Rename WindowHandler to WindowWrapper 2015-10-26 15:00:46 -05:00
Alexander Bock 062817b7fb More work moving code to window wrapper
Removing capability to show SGCT rendering information
2015-10-26 11:20:48 -05:00
Alexander Bock 49dbb1ce20 More work on converting to SGCT window handler
Adapting to change in SGCT key callback handling
2015-10-26 09:19:28 -05:00
Alexander Bock d84edc4090 More work on transitioning to windowwrapper for keyboard and mouse interaction 2015-10-25 17:34:03 -05:00
Alexander Bock 26ea512910 Set Interaction sensitivity to 1 on default 2015-10-25 11:27:41 -05:00
Alexander Bock d4da374c23 Reenable colored font rendering 2015-10-08 22:59:36 +02:00
Alexander Bock cb27e37778 Fixes to make the new GLM version compatible 2015-10-05 14:40:21 +02:00
Alexander Bock 35e95b94e7 First version to update OpenSpace to the new SGCT version 2015-10-05 00:07:38 +02:00