Commit Graph

1167 Commits

Author SHA1 Message Date
Karl Bladin
ff74f0794c Merge branch 'develop' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing 2016-04-04 12:12:19 -04:00
Emil Axelsson
90f3193236 Merge branch 'develop' of github.com:OpenSpace/OpenSpace-Development into develop 2016-04-01 17:48:45 +02:00
Emil Axelsson
568a6a3416 fix bug when numberOfSamples is 0 2016-04-01 17:47:00 +02:00
Erik Broberg
9d45463e93 Created class DistanceSwitch and added length() in double precision to PowerScaledCoordinate 2016-03-30 19:34:42 -04:00
kalbl
86debebdd9 Fix compilation errors for OSX. 2016-03-30 15:20:20 -04:00
Michael Nilsson
2ca5d52fa3 fix for linux 2016-03-28 11:25:04 -04:00
Emil Axelsson
80fe89dbc8 change interfaces from pointer to reference 2016-03-23 14:00:40 +01:00
Emil Axelsson
479644496d fix warning in blockplaneintersectiongeometry 2016-03-22 11:12:00 +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
9406ab8722 Update Ghoul reference 2016-03-20 21:37:24 +01:00
Alexander Bock
c3aa8fecc2 Update ghoul to account for removed boost dependency 2016-03-15 23:59:57 +01:00
Alexander Bock
df0d0d1258 Update Ghoul version to accommodate public API bool parameter changes 2016-03-06 08:08:06 +01:00
kalbl
1b8eae5157 Added texture reader and writer for SOIL in renderengine. This solves a problem when using SOIL for image reading which made the program unable to load textures. 2016-03-04 10:47:25 +01:00
Alexander Bock
598409c4d1 Fix for crash from double deinitialization 2016-02-22 21:41:35 +01:00
Alexander Bock
7b1670ea0b Remove startup warnings 2016-02-21 01:50:51 +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
312d52c038 Minor changes 2016-02-07 14:05:59 +01:00
Alexander Bock
71f7a1958b Change single.xml to use PlanarProjection and (0,0,0) user pos instead
Remove computed detection of view direction
2016-02-07 14:05:44 +01:00
Alexander Bock
d0f4ab6f60 Removing Jenkins warnings 2016-02-05 23:28:45 +01:00
Alexander Bock
794bbcedda Fix more GLM degrees->radians changes 2016-02-05 22:48:49 +01:00
Alexander Bock
7e3024959a Remove the disabling of the blend function after an image projection that caused flickering
Set the window resolution in the framebuffer renderer
Fix spelling errors in CK kernel error messages
Reference new leap second kernel
2016-02-05 20:48:35 +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
86e6c21f96 - Make missing SGCT a non-fatal error in CMake
- Add screen sizes to the abuffer dictionary
- Use the new method for setting the screen size in the star rendering
2016-02-04 21:41:17 +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
abffcf4175 Allow the camera to get closer to objects 2016-01-31 16:47:36 +01:00
Alexander Bock
cee66b9c5e Fix image projection error that occurred due to degrees v radians glm functions
Don't crash if a shader recompile fails, but log an error
Use correct file extension for binary Spice kernels
2016-01-31 13:56:46 +01:00
Alexander Bock
85d564767b Fix #define None include error on X11 systems 2016-01-18 18:05:57 +01:00
Alexander Bock
aee6146d3f Xlib compile error 2016-01-18 17:52:14 +01:00
Alexander Bock
bae8d0aa76 Making OpenSpaceTest application compile with API change
Set default start to July 2015
Move default window out of the corner
Compile fixes
2016-01-14 16:05:29 +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
1a4ea8763e Fix performance window access to SharedMemory 2015-12-23 14:41:17 -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