Michael Nilsson
e8175ee54c
solved merge conflict, fix for close(socket) in paralellconnection
2016-03-17 14:41:05 -04:00
Sebastian Piwell
171aa46150
Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage
...
Conflicts:
include/openspace/rendering/screenspacerenderable.h
modules/base/rendering/screenspaceimage.cpp
src/rendering/screenspacerenderable.cpp
2016-03-16 17:42:13 -04:00
Sebastian Piwell
0f963ee3b8
Created screenspaceframebuffer
2016-03-16 17:27:10 -04:00
Michael Nilsson
5a0ee0bc7a
add math.h to screenspacerenderables for M_PI, windows only
2016-03-16 17:21:54 -04:00
Michael Nilsson
fd5a3a7a1f
fix issue with abufferrenderer not working with screenspacerenderables
2016-03-16 16:38:05 -04:00
Sebastian Piwell
cab6951140
Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage
2016-03-16 11:47:58 -04:00
Sebastian Piwell
e6aca4b836
Spherical and Euclidean coordinate update each other
2016-03-16 11:47:53 -04:00
Michael Nilsson
f95bb727d7
removed camera parameter from screenspaceimage render function
2016-03-16 09:10:14 -04:00
Alexander Bock
c3aa8fecc2
Update ghoul to account for removed boost dependency
2016-03-15 23:59:57 +01:00
Sebastian Piwell
2a110768c8
Better test mouse controls for screenspaceimages
2016-03-15 09:21:17 -04:00
Michael Nilsson
09f00fe81a
convertion to polar coordinates on flatscreen disable
2016-03-14 17:45:37 -04:00
Michael Nilsson
7dfdb2083e
solved merge conflict
2016-03-11 15:09:07 -05:00
Michael Nilsson
c746338553
added viewprojection matrix to screenspaceimage shaderprogram
2016-03-11 09:36:49 -05:00
Sebastian Piwell
f01299fe69
Add screenspacerenderables at runtime
2016-03-10 17:41:10 -05:00
Sebastian Piwell
a53e289a20
Position, scale and texturepath properties
2016-03-10 15:04:44 -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
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
Alexander Bock
a087fe47e3
Add fromString methods for enums
2015-11-21 10:39:26 -05:00
Alexander Bock
443963a151
Finished cleanup of SpiceManager
2015-11-20 18:36:03 -05:00
Alexander Bock
2c84368b0b
More cleaning of SpiceManager
2015-11-20 00:54:19 -05:00
