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
Alexander Bock
c3aa8fecc2
Update ghoul to account for removed boost dependency
2016-03-15 23:59:57 +01:00
Emil Axelsson
73cf15beb6
- Add currentDrawBufferResolution method in WindowWrapper
...
- Base renderer resolution on draw buffer resolution instead of window res
- Obtain number of aa samples from config file, instead of hard coding to
eight samples
2016-02-09 10:46:51 +01:00
Alexander Bock
d0f4ab6f60
Removing Jenkins warnings
2016-02-05 23:28:45 +01:00
Alexander Bock
877a4d1ba6
Updated copyright header
2016-02-05 17:43:21 +01:00
Emil Axelsson
a6a9537b6c
Merge with antialiased abuffer
2016-02-03 17:47:29 +01:00
Emil Axelsson
d4ff8119d1
refactor abuffer and add msaa support. volumes temporarily disabled.
2016-02-02 11:30:27 +01:00
Alexander Bock
0679a48442
Merge branch 'feature/cleanup' of openspace.itn.liu.se:/openspace into feature/cleanup
2016-01-03 11:28:14 -05:00
Alexander Bock
c7cc137da9
Started cleanup of LuaConsole
2016-01-03 11:27:50 -05:00
Alexander Bock
13510e1085
Merge branch 'feature/cleanup' of openspace.itn.liu.se:/openspace into feature/cleanup
2016-01-02 21:40:29 +01:00
Alexander Bock
c87fdfd38b
Fixes for Windows
...
Fixing shader paths for fieldlines rendering
Update Kameleon to work with MSVC 2015 fix
2016-01-02 21:40:15 +01:00
Alexander Bock
cdf228975a
Started cleanup of Time class
2015-12-23 17:44:05 -05:00
Alexander Bock
52971caef5
Cleaning the ScreenLog
2015-12-23 17:18:59 -05:00
Alexander Bock
465715f652
Remove DummyWindowWrapper and implement default methods into WindowWrapper
2015-12-23 16:26:24 -05:00
Alexander Bock
0895d6e6d0
Some cleanup of ScriptEngine
2015-12-16 17:23:17 -08:00
Alexander Bock
0735d0fc2d
More cleanup of FactoryManager
2015-12-14 17:55:24 -08: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
c99666e75a
Cleaning ConfigurationManager and OpenSpaceEngine
...
Updated Ghoul version
2015-12-14 16:44:13 -08:00
Alexander Bock
adfc7d244c
Cleanup of WindowWrapper classes
2015-12-14 15:55:28 -08:00
Alexander Bock
6eca5c0f68
More module cleanup
2015-12-14 11:46:44 -08:00
Alexander Bock
2fce471743
Started cleanup of module structure
2015-12-14 10:50:38 -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
875de328aa
Update Ghoul version
...
Make the modules depend on C++14
Change the OpenSpace code to the new Ghoul version
2015-12-07 18:54:17 -05:00
Alexander Bock
0006e83f4b
Updated Ghoul
...
Adapted to cleanup in Ghoul
2015-11-30 17:50:26 -05:00
Alexander Bock
293faf8ca9
Adopted cleaned up fontrendering code
2015-11-23 20:18:38 -05:00
Alexander Bock
3806318b0d
Applied Ghoul cleanups
2015-11-22 21:26:02 -05:00
Alexander Bock
2cc1a91fad
Rename SpiceKernelException to SpiceException
2015-11-21 23:15:48 -05:00
