Commit Graph

1648 Commits

Author SHA1 Message Date
Sebastian Piwell
f01299fe69 Add screenspacerenderables at runtime 2016-03-10 17:41:10 -05:00
Sebastian Piwell
540f7821b8 Compile fix 2016-03-10 15:08:43 -05:00
Sebastian Piwell
d27560957d Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage
Conflicts:
	modules/base/rendering/screenspaceimage.cpp
2016-03-10 15:06:34 -05:00
Sebastian Piwell
a53e289a20 Position, scale and texturepath properties 2016-03-10 15:04:44 -05:00
Michael Nilsson
49eece4d43 change test image url to relative path in screenspaceimage 2016-03-10 14:44:15 -05:00
Sebastian Piwell
afc3883d4d Flat screen property 2016-03-10 13:01:05 -05:00
Sebastian Piwell
07d6662957 ScreenSpaceRenderabled enabled propery in GUI 2016-03-10 11:19:22 -05:00
Sebastian Piwell
bdaf8dd956 Texture on screnspaceimage 2016-03-09 16:57:29 -05:00
Sebastian Piwell
dab046b302 Create ScrenSpaceImage at runtime for testing purposes 2016-03-09 10:45:53 -05:00
Michael Nilsson
5a2833743d add support for screenspacerenderables in renderengine 2016-03-08 17:59:06 -05:00
Michael Nilsson
aef82d5c9e create screenspacerenderable 2016-03-08 15:11:59 -05:00
Michael Nilsson
ec9261e1da fix function call to logmanager 2016-03-07 09:37:45 -05:00
Alexander Bock
df0d0d1258 Update Ghoul version to accommodate public API bool parameter changes 2016-03-06 08:08:06 +01:00
Alexander Bock
ff7f4f61db Reverting breaking changes on Windows 2016-03-06 04:34:41 +01:00
piwell
2d6403bdac Ghoul linux fix 2016-03-04 15:51:23 -05:00
piwell
87840bdb7f Linux fix 2016-03-04 15:06:41 -05: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
257f90d1ec Moving Kameleon subrepository to Github 2016-03-02 21:48:56 +01:00
Alexander Bock
598409c4d1 Fix for crash from double deinitialization 2016-02-22 21:41:35 +01:00
Alexander Bock
6653d67a3f Update Gitignore to include data files 2016-02-21 14:12:24 +01:00
Alexander Bock
92f3707368 Use previously released kernels for New Horizons 2016-02-21 14:09:56 +01:00
Alexander Bock
1905db19ba Add files from the previous data submodule 2016-02-21 01:52:48 +01:00
Alexander Bock
58ee7647e8 Remove data submodule in preparation for direct integration 2016-02-21 01:51:13 +01:00
Alexander Bock
7b1670ea0b Remove startup warnings 2016-02-21 01:50:51 +01:00
Alexander Bock
60cfa1c080 Updated Ghoul version 2016-02-20 17:53:16 +01:00
Emil Axelsson
c87eb5dd26 - increase fisheye resolution
- set correct aspect ratio of planar projection
2016-02-09 11:48:32 +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
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