Commit Graph

738 Commits

Author SHA1 Message Date
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
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
eed5885f25 Improve interaction. 2016-05-25 21:32:03 -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
3ff322c282 Clean up camera class 2016-05-20 12:03:05 -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
Michael Nilsson
d2e913b70e moved histogram class to core 2016-05-17 12:49:16 -04:00
Erik Broberg
afd8ba5e9b Added copy constructor for Camera 2016-05-11 18:36:19 -04:00
Kalle Bladin
04a363bab1 Merge branch 'develop' into feature/globebrowsing 2016-05-04 15:57:44 -04: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
75175512a8 First implementation of moving the startup scripts into the scene description files 2016-04-27 16:46:31 +02:00
Kalle Bladin
aaa099d542 Solve conflict and fixed old code that did not run on OSX due to use of depricated shader functionality. 2016-04-18 23:05:19 -04:00
Kalle Bladin
ada97704f8 Solve compilation problems for OSX. 2016-04-18 22:44:20 -04: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
a21c9538b6 Untabify more files 2016-04-18 15:15:30 +02:00
Alexander Bock
4936a4a084 Remove sgct.h inclusion from LuaConsole
Untabify more files
2016-04-18 11:12:12 +02:00
Alexander Bock
46b207b379 Removing some cppcheck warnings 2016-04-14 22:49:03 -04:00
Alexander Bock
b43a454e9f Fix GCC compiler warnings 2016-04-14 22:40:25 -04:00
Erik Broberg
3ec7badcf0 Camera: added convenience method for getting viewRotation and added inner class SyncData 2016-04-14 17:33:52 -04: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
cf517f5309 Replacing CMake-based version setting with C++-based version
Adding function to OpenSpace that returns the license header
2016-04-14 10:27:59 -04:00
Emil Axelsson
48bd41ad9f merge in changes from develop 2016-04-12 16:29:35 +02:00
Emil Axelsson
4ff0205eae bring in support for multiresolution volume rendering 2016-04-11 16:56:44 +02: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
Michael Nilsson
0d0f761d6e downloadmanager return shared_ptr to FileFutures instead of bare pointers 2016-04-05 11:33:58 -04:00
Alexander Bock
019092e98e Correctly set child nodes for SceneGraphNode%s 2016-04-04 20:26:10 +02:00
Karl Bladin
ff74f0794c Merge branch 'develop' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-04-04 12:12:19 -04:00
Erik Broberg
9d45463e93 Created class DistanceSwitch and added length() in double precision to PowerScaledCoordinate 2016-03-30 19:34:42 -04:00
Emil Axelsson
80fe89dbc8 change interfaces from pointer to reference 2016-03-23 14:00:40 +01:00
Emil Axelsson
a44eed992f Merge remote-tracking branch 'origin/feature/volumerendering' into develop 2016-03-21 18:55:32 +01:00
Emil Axelsson
ebe10a29b5 Volume rendering compatible with abuffer and framebuffer renderers 2016-03-21 16:40:24 +01:00