 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 |
|
|
Michael Nilsson
|
f4964b1628
|
request file extension
|
2016-04-01 16:32:18 -04:00 |
|
|
Emil Axelsson
|
90f3193236
|
Merge branch 'develop' of github.com:OpenSpace/OpenSpace-Development into develop
|
2016-04-01 17:48:45 +02:00 |
|
|
Emil Axelsson
|
568a6a3416
|
fix bug when numberOfSamples is 0
|
2016-04-01 17:47:00 +02:00 |
|
|
Sebastian Piwell
|
7423d2f1c3
|
Change cygnet in screenspacecygnet
|
2016-03-31 17:14:52 -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
|
2bfe0129e4
|
add screenspacecygnets
|
2016-03-31 12:17:32 -04:00 |
|
|
Sebastian Piwell
|
100f1b75dd
|
Seperated iSWAManager and iSWAContainer
|
2016-03-31 10:53:03 -04:00 |
|
|
Michael Nilsson
|
ba57bd4cf8
|
solve merge conflict
|
2016-03-31 09:50:50 -04:00 |
|
|
Sebastian Piwell
|
a2fb30b432
|
Depth working again
|
2016-03-31 09:39:05 -04:00 |
|
|
Sebastian Piwell
|
687b8551d2
|
Merge branch 'develop' into feature/screenspaceimage
|
2016-03-31 09:13:57 -04:00 |
|
|
Michael Nilsson
|
d31adad2b0
|
Merge branch 'develop' into feature/iSWA
|
2016-03-31 09:05:00 -04:00 |
|
|
Michael Nilsson
|
0feb7fb771
|
fix for windows. removed thread for updating texture.
|
2016-03-30 17:26:05 -04:00 |
|
|
Michael Nilsson
|
e2e1ae9829
|
change function and variable names from datasurface to iswacygnet in ISWAManager
|
2016-03-30 15:59:08 -04:00 |
|
|
Sebastian Piwell
|
add61b099e
|
More name changes
|
2016-03-30 15:42:22 -04:00 |
|
|
Sebastian Piwell
|
c935ce6fe0
|
renamed module dataplane to iswa
|
2016-03-30 15:27:31 -04:00 |
|
|
kalbl
|
86debebdd9
|
Fix compilation errors for OSX.
|
2016-03-30 15:20:20 -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 |
|
|
Sebastian Piwell
|
57afa8fe9f
|
TexturePlane scales after texture ratio
|
2016-03-30 09:42:46 -04:00 |
|
|
Sebastian Piwell
|
0bcdb88874
|
Properies for dataSurface
|
2016-03-30 09:36:41 -04:00 |
|
|
Michael Nilsson
|
2ca5d52fa3
|
fix for linux
|
2016-03-28 11:25:04 -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 |
|
|
Sebastian Piwell
|
d269eedf77
|
Correct size and position
|
2016-03-22 09:31:17 -04:00 |
|
|
Emil Axelsson
|
479644496d
|
fix warning in blockplaneintersectiongeometry
|
2016-03-22 11:12:00 +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 |
|
|
Alexander Bock
|
9406ab8722
|
Update Ghoul reference
|
2016-03-20 21:37:24 +01:00 |
|
|
Alexander Bock
|
8031a8c2d4
|
Fixed RenderableModelProject problem with degrees v radians
Added 67P coordinate system to onscreen gui
|
2016-03-18 23:00:37 +01:00 |
|
|
Michael Nilsson
|
85225946b9
|
solved merge conflict
|
2016-03-18 13:57:28 -04:00 |
|
|
Michael Nilsson
|
af8880274c
|
discard fragment if alpha is 0 in screenspacerenderables
|
2016-03-18 13:52:11 -04:00 |
|
|
Sebastian Piwell
|
48021a46e2
|
Sort screenspacerenderables in correct render order
|
2016-03-18 12:02:46 -04:00 |
|
|
Sebastian Piwell
|
43add83e19
|
Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage
|
2016-03-18 11:11:50 -04:00 |
|
|
Sebastian Piwell
|
d77ba76d33
|
Crop framebuffers
|
2016-03-18 11:11:42 -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
|
daa06cb387
|
Scale fix
|
2016-03-17 18:11:47 -04:00 |
|
|
Sebastian Piwell
|
8bc736acec
|
Add render functions to screenspaceframebuffer
|
2016-03-17 17:52:07 -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
|
5bb4e3640d
|
Solved merge conflict
|
2016-03-16 17:42:51 -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 |
|