cab6951140
Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage
2016-03-16 11:47:58 -04:00
e6aca4b836
Spherical and Euclidean coordinate update each other
2016-03-16 11:47:53 -04:00
f5d223c557
include camera in screenspaceimage
2016-03-16 09:19:28 -04:00
e9a3bbd44d
Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage
2016-03-16 09:10:31 -04:00
f95bb727d7
removed camera parameter from screenspaceimage render function
2016-03-16 09:10:14 -04:00
6bea326151
Correct euclidean to spherical conversion
2016-03-16 09:09:22 -04:00
97a7de9f28
Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage
2016-03-15 09:20:43 -04:00
2a110768c8
Better test mouse controls for screenspaceimages
2016-03-15 09:21:17 -04:00
49aa80c859
rotation instead of translation in polar coordinates mode
2016-03-15 09:20:29 -04:00
09f00fe81a
convertion to polar coordinates on flatscreen disable
2016-03-14 17:45:37 -04:00
a94f877ac7
add occlusionDepth uniform to screenspaceimage
2016-03-14 10:39:20 -04:00
34ca17563f
Occlussion for fisheye and singel_two_win
2016-03-11 18:51:10 -05:00
cfd68f2921
ScreenSpaceImage occlussion
2016-03-11 17:08:05 -05:00
7dfdb2083e
solved merge conflict
2016-03-11 15:09:07 -05:00
c746338553
added viewprojection matrix to screenspaceimage shaderprogram
2016-03-11 09:36:49 -05:00
f01299fe69
Add screenspacerenderables at runtime
2016-03-10 17:41:10 -05:00
fe2d90eb8f
solved conflict
2016-03-10 15:57:59 -05:00
9b3f2141a2
windows fix in screenspaceimage
2016-03-10 15:52:48 -05:00
540f7821b8
Compile fix
2016-03-10 15:08:43 -05:00
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
a53e289a20
Position, scale and texturepath properties
2016-03-10 15:04:44 -05:00
49eece4d43
change test image url to relative path in screenspaceimage
2016-03-10 14:44:15 -05:00
afc3883d4d
Flat screen property
2016-03-10 13:01:05 -05:00
07d6662957
ScreenSpaceRenderabled enabled propery in GUI
2016-03-10 11:19:22 -05:00
bdaf8dd956
Texture on screnspaceimage
2016-03-09 16:57:29 -05:00
dab046b302
Create ScrenSpaceImage at runtime for testing purposes
2016-03-09 10:45:53 -05:00
5a2833743d
add support for screenspacerenderables in renderengine
2016-03-08 17:59:06 -05:00
aef82d5c9e
create screenspacerenderable
2016-03-08 15:11:59 -05:00
ec9261e1da
fix function call to logmanager
2016-03-07 09:37:45 -05:00
df0d0d1258
Update Ghoul version to accommodate public API bool parameter changes
2016-03-06 08:08:06 +01:00
ff7f4f61db
Reverting breaking changes on Windows
2016-03-06 04:34:41 +01:00
2d6403bdac
Ghoul linux fix
2016-03-04 15:51:23 -05:00
87840bdb7f
Linux fix
2016-03-04 15:06:41 -05:00
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
257f90d1ec
Moving Kameleon subrepository to Github
2016-03-02 21:48:56 +01:00
598409c4d1
Fix for crash from double deinitialization
2016-02-22 21:41:35 +01:00
6653d67a3f
Update Gitignore to include data files
2016-02-21 14:12:24 +01:00
92f3707368
Use previously released kernels for New Horizons
2016-02-21 14:09:56 +01:00
1905db19ba
Add files from the previous data submodule
2016-02-21 01:52:48 +01:00
58ee7647e8
Remove data submodule in preparation for direct integration
2016-02-21 01:51:13 +01:00
7b1670ea0b
Remove startup warnings
2016-02-21 01:50:51 +01:00
60cfa1c080
Updated Ghoul version
2016-02-20 17:53:16 +01:00
c87eb5dd26
- increase fisheye resolution
...
- set correct aspect ratio of planar projection
2016-02-09 11:48:32 +01:00
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
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
781ca62742
fix bugs in fisheye rendering
2016-02-08 14:33:19 +01:00
dd98cef974
Enable the RenderableShadowCylinder's color to be set via properties
2016-02-07 20:37:11 +01:00
66fdf4b6a4
Increasing required Visual Studio version to 2015
...
Moving external library handling from OpenSpace to Ghoul
2016-02-07 20:35:25 +01:00
50f1743067
Make onscreen gui not break if resolution is changed
2016-02-07 15:09:25 +01:00
312d52c038
Minor changes
2016-02-07 14:05:59 +01:00
Sebastian Piwell