Commit Graph

1249 Commits

Author SHA1 Message Date
Erik Broberg
9ddb54d546 Add explicit default constructor and copy constructor to class Time 2016-05-31 19:50:11 -04:00
Erik Broberg
6d4c9331dd Enable Time conversion to ISO8601 format 2016-05-31 19:37:17 -04:00
Kalle Bladin
f1d4e27ce0 Solve problem with globe lagging behind in globebrowsing interaction mode. 2016-05-27 15:34:52 -04:00
Kalle Bladin
bbc002514d Possible to render in fisheye mode now that the combinedViewMatrix() function in the camera class actually returns the combined view matrix. 2016-05-27 12:13:40 -04:00
Kalle Bladin
3dff659b3c Cleanup. 2016-05-27 11:38:56 -04:00
Kalle Bladin
060298f74b Solve precision problem that causes jagged movement. 2016-05-27 11:09:07 -04:00
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
ceb7d0fa63 Remove use of old mousecontroller 2016-05-25 21:32:52 -04:00
Kalle Bladin
eed5885f25 Improve interaction. 2016-05-25 21:32:03 -04:00
Kalle Bladin
9bbd52867a Merge branch 'feature/interaction' of github.com:OpenSpace/OpenSpace-Development into feature/interaction 2016-05-25 18:50:40 -04:00
Kalle Bladin
601f86ae78 Solve bug for when tilting the camera. 2016-05-25 18:50:06 -04:00
Kalle Bladin
f525eb53cc Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-05-25 18:03:21 -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
Erik Broberg
128ee57538 Merge in initialization of camera pos from feature/interaction 2016-05-25 16:47:15 -04:00
Erik Broberg
af9b065de8 Camera gets initialized to position specified in scene file 2016-05-25 16:42:59 -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
faa52404b2 Merge branch 'feature/camera' into feature/interaction 2016-05-20 16:09:53 -04:00
Kalle Bladin
309c97098c Changed interface of camera class 2016-05-20 16:09:35 -04:00
Kalle Bladin
dcd00e77d0 Minor structural changes in interaction handler. 2016-05-20 16:03:30 -04:00
Kalle Bladin
74f190ef7e More clean up in camera class. 2016-05-20 11:46:36 -04:00
Kalle Bladin
e057f60a18 Remove psc internally from camera class. 2016-05-20 10:31:33 -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
Kalle Bladin
4ac19f21b7 Solve merge conflict. 2016-05-19 12:10:14 -04:00
Kalle Bladin
0215c63bab Camera class compiles but missing implementation of two functions. 2016-05-19 11:29:31 -04:00
Alexander Bock
b964cbe1a2 Remove comments in Downloadmanager 2016-05-19 13:25:47 +02:00
Alexander Bock
caae5336b5 Make use of new thread priority scheme
Updated Ghoul repository
2016-05-19 13:23:40 +02:00
Alexander Bock
92df988bb6 Show some information when NewHorizons is not present 2016-05-18 21:37:41 +02:00
Alexander Bock
ecf1862eb3 Only show Pluto text information when NewHorizons node is present 2016-05-18 20:40:38 +02:00
Erik Broberg
ce67314065 Naive and simple distance dependent interaction speed. Useful for debugging 2016-05-17 18:22:57 -04:00
Alexander Bock
e7f728868d Merge branch 'develop' of https://github.com/OpenSpace/OpenSpace-Development into develop 2016-05-17 19:47:46 +02:00
Alexander Bock
ed8cebbb9d Fix crash with incidenttargetlist for rosetta 2016-05-17 19:47:41 +02:00
Michael Nilsson
d2e913b70e moved histogram class to core 2016-05-17 12:49:16 -04:00
Alexander Bock
2c7e1ec9f4 Do not let exceptions in update function escape the loading 2016-05-08 16:21:17 +02:00
Alexander Bock
d66e2e1b59 Add time information to SpiceExeception 2016-05-05 10:46:26 +02:00
Kalle Bladin
04a363bab1 Merge branch 'develop' into feature/globebrowsing 2016-05-04 15:57:44 -04:00
Alexander Bock
cfb895e2e9 Move fboPass shader into NewHorizons module 2016-05-01 13:14:36 +02:00
Alexander Bock
20532d704f Rename Lua functions to preInitialization and postInitialization
Apply change to all scene files in the repository
Remove default_settings and default_startup as their functoins have moved into the scene file
2016-04-30 14:18:08 +02: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
95751691b0 Merge branch 'develop' into feature/startupscripts 2016-04-30 10:26:24 +02:00