 Michael Nilsson
|
49d8319938
|
merge with develop
|
2016-04-05 12:02:25 -04:00 |
|
|
Michael Nilsson
|
0d0f761d6e
|
downloadmanager return shared_ptr to FileFutures instead of bare pointers
|
2016-04-05 11:33:58 -04:00 |
|
|
Sebastian Piwell
|
6f1b9a9fab
|
Merge with screenspaceimage
|
2016-04-04 15:51:30 -04:00 |
|
|
Sebastian Piwell
|
453fbe300e
|
Remove screenspacerenderables in any order
|
2016-04-04 15:40:45 -04:00 |
|
|
Sebastian Piwell
|
8e996f5bab
|
Remove screenspacerenderables and iSWACygnets
|
2016-04-04 15:30:54 -04:00 |
|
|
Alexander Bock
|
019092e98e
|
Correctly set child nodes for SceneGraphNode%s
|
2016-04-04 20:26:10 +02:00 |
|
|
Sebastian Piwell
|
3fbfb9bb33
|
Remove screenspacerenderables
|
2016-04-04 13:49:21 -04:00 |
|
|
Karl Bladin
|
ff74f0794c
|
Merge branch 'develop' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing
|
2016-04-04 12:12:19 -04:00 |
|
|
Michael Nilsson
|
f4964b1628
|
request file extension
|
2016-04-01 16:32:18 -04:00 |
|
|
Sebastian Piwell
|
e729723b06
|
Merge with feature/screenspacerenderable
|
2016-03-31 15:58:54 -04:00 |
|
|
Sebastian Piwell
|
d610171441
|
for simple testing
|
2016-03-31 15:54:29 -04:00 |
|
|
Sebastian Piwell
|
79979fe8dd
|
Clean up
|
2016-03-31 14:53:42 -04:00 |
|
|
Michael Nilsson
|
ba57bd4cf8
|
solve merge conflict
|
2016-03-31 09:50:50 -04:00 |
|
|
Erik Broberg
|
9d45463e93
|
Created class DistanceSwitch and added length() in double precision to PowerScaledCoordinate
|
2016-03-30 19:34:42 -04:00 |
|
|
Sebastian Piwell
|
c935ce6fe0
|
renamed module dataplane to iswa
|
2016-03-30 15:27:31 -04:00 |
|
|
Michael Nilsson
|
e09ed7594e
|
Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage
|
2016-03-30 09:52:01 -04:00 |
|
|
Michael Nilsson
|
d390a70fb6
|
solve merge conflict
|
2016-03-30 09:51:34 -04:00 |
|
|
Michael Nilsson
|
3e7249157c
|
add some documentation
|
2016-03-30 09:17:49 -04:00 |
|
|
Michael Nilsson
|
5911149273
|
downloadmanager load to string. update texture function to renderabletextureplane
|
2016-03-23 16:57:25 -04:00 |
|
|
Emil Axelsson
|
80fe89dbc8
|
change interfaces from pointer to reference
|
2016-03-23 14:00:40 +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 |
|
|
Sebastian Piwell
|
48978f38fc
|
removed mouseinteraction test for screenspacerenderables
|
2016-03-21 09:20:47 -04:00 |
|
|
Sebastian Piwell
|
48021a46e2
|
Sort screenspacerenderables in correct render order
|
2016-03-18 12:02:46 -04:00 |
|
|
Michael Nilsson
|
5553ec02c9
|
solved merge conflict
|
2016-03-18 10:35:40 -04:00 |
|
|
Michael Nilsson
|
70d7d3c82a
|
add alpha property to screenspacerenderable
|
2016-03-18 10:33:34 -04:00 |
|
|
Sebastian Piwell
|
8bc736acec
|
Add render functions to screenspaceframebuffer
|
2016-03-17 17:52:07 -04:00 |
|
|
Michael Nilsson
|
4b6b34cd74
|
added test case for screenspaceimage
|
2016-03-17 17:45:27 -04:00 |
|
|
Sebastian Piwell
|
ac40c0a7d6
|
Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage
|
2016-03-17 15:38:36 -04:00 |
|
|
Sebastian Piwell
|
31f1e91b06
|
Tests for screenSpaceFramebuffer
|
2016-03-17 15:38:21 -04:00 |
|
|
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 |
|