Commit Graph

1621 Commits

Author SHA1 Message Date
Emil Axelsson
ebbbbb2dfd Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop
Conflicts:
	src/rendering/renderengine.cpp
2016-02-08 15:07:38 +01:00
Emil Axelsson
781ca62742 fix bugs in fisheye rendering 2016-02-08 14:33:19 +01:00
Alexander Bock
dd98cef974 Enable the RenderableShadowCylinder's color to be set via properties 2016-02-07 20:37:11 +01:00
Alexander Bock
66fdf4b6a4 Increasing required Visual Studio version to 2015
Moving external library handling from OpenSpace to Ghoul
2016-02-07 20:35:25 +01:00
Alexander Bock
50f1743067 Make onscreen gui not break if resolution is changed 2016-02-07 15:09:25 +01:00
Alexander Bock
312d52c038 Minor changes 2016-02-07 14:05:59 +01:00
Alexander Bock
cae966ba56 Remove the hard-coded ABuffer implementation for support on Mac 2016-02-07 14:05:54 +01:00
Alexander Bock
54c2304461 Update ghoul for image texture loading 2016-02-07 14:05:49 +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
2f7fbb1f39 Uncomment old Progressbar from Kameleon to make jenkins compile again 2016-02-05 23:00:12 +01:00
Alexander Bock
794bbcedda Fix more GLM degrees->radians changes 2016-02-05 22:48:49 +01:00
Alexander Bock
f266f0bcee Updated copyright header 2016-02-05 22:47:37 +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
f8e9a158b3 Merge branch 'develop' of openspace.itn.liu.se:/openspace into develop 2016-02-04 10:02:39 +01:00
Emil Axelsson
789ede5197 disable volume module to suppress compilation errors 2016-02-04 10:02:16 +01:00
Alexander Bock
e31309a778 Updated Ghoul repository 2016-02-03 18:56:32 +01:00
Emil Axelsson
a6a9537b6c Merge with antialiased abuffer 2016-02-03 17:47:29 +01:00
Emil Axelsson
35765881f7 update ghoul dependency 2016-02-02 11:31:22 +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
f1437c7183 Remove superfluous LINFO in RenderablePlanetProjection 2016-01-31 13:59:18 +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
18a271c43e Updated ghoul repository 2016-01-19 18:10:03 +01:00
Alexander Bock
85ce552cc8 Remove unused CMakeLists file 2016-01-18 18:39:19 +01:00
Alexander Bock
dda5c3acc2 Update Ghoul repository
Add explicit C++14 standard requirement for OpenSpaceTest target
2016-01-18 18:32:20 +01:00
Alexander Bock
fc60692aeb Remove hard-coded C++ version checking from CMake and replaced with CXX_STANDARD CMake property 2016-01-18 18:16:02 +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
50228d9296 Updated Ghoul repository
GCC compile fix
2016-01-18 17:42:51 +01:00
Alexander Bock
0edf3cd5d9 Merge branch 'feature/cleanup' into develop 2016-01-18 17:12:49 +01:00
Alexander Bock
14b5c1ecbd Updated Ghoul repository 2016-01-18 17:09:23 +01:00
Alexander Bock
d938663a52 Updated Ghoul repository 2016-01-14 16:21:30 +01:00
Alexander Bock
136a661866 Updated ghoul and data repositories 2016-01-14 16:06:26 +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
b43f622a9f Fixes for libtorrent version to be compiled with VS 2015 2016-01-14 16:04:40 +01:00
Jonathas Costa
1ec01d9fea Updating launcher to Ghoul API. 2016-01-07 17:11:33 -05: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