 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 |
|
|
kalbl
|
360877d7ff
|
Add new version of ghoul to solve OSX compile errors.
|
2016-03-30 15:29:08 -04:00 |
|
|
kalbl
|
86debebdd9
|
Fix compilation errors for OSX.
|
2016-03-30 15:20:20 -04:00 |
|
|
Michael Nilsson
|
d7509ddc52
|
add loggerCat
|
2016-03-30 10:03:05 -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
|
2ca5d52fa3
|
fix for linux
|
2016-03-28 11:25:04 -04:00 |
|
|
Michael Nilsson
|
d7e4a8b8e9
|
update gitignor with pluto texture folders
|
2016-03-24 16:48:04 -04:00 |
|
|
Emil Axelsson
|
7b6a47973a
|
add toyvolume example to data
|
2016-03-23 14:21:28 +01:00 |
|
|
Emil Axelsson
|
80fe89dbc8
|
change interfaces from pointer to reference
|
2016-03-23 14:00:40 +01:00 |
|
|
Emil Axelsson
|
c5aba19d52
|
Merge branch 'master' of github.com:OpenSpace/OpenSpace-Development into develop
|
2016-03-23 13:33:42 +01:00 |
|
|
Emil Axelsson
|
0b3cbaa961
|
fix bug in multimodelgeometry loading, initializing w to 0 for all vertices
|
2016-03-23 11:52:29 +01: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
|
55660846f1
|
Add missing copyright statements
|
2016-03-21 17:04:10 +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
|
5181d812cd
|
Update Ghoul repository
|
2016-03-20 23:30:54 +01:00 |
|
|
Alexander Bock
|
9406ab8722
|
Update Ghoul reference
|
2016-03-20 21:37:24 +01:00 |
|
|
Michael Nilsson
|
97aa12b77b
|
added boost dependency to kameleon module
|
2016-03-18 17:09:51 -04: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
|
45c0fa761c
|
Merge branch 'feature/screenspaceimage' of github.com:OpenSpace/OpenSpace-Development into feature/screenspaceimage
|
2016-03-17 17:52:22 -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 |
|
|
Michael Nilsson
|
1436269959
|
fix windows merge conflict error
|
2016-03-17 16:06:21 -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 |
|
|
Michael Nilsson
|
910ab3458e
|
screenspaceimage test boilerplate and first test
|
2016-03-17 10:49:01 -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 |
|
|
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 |
|
|
Jonathas Costa
|
69f9e21824
|
New Ghoul version.
|
2016-03-16 11:11:50 -04:00 |
|
|
Jonathas Costa
|
b09026ee42
|
Merge branch 'develop' into MultiModelFormatReader
|
2016-03-16 10:44:07 -04:00 |
|
|
Jonathas Costa
|
182e332661
|
New Ghoul version (with Assimp library support).
|
2016-03-16 10:40:25 -04:00 |
|
|
Michael Nilsson
|
f5d223c557
|
include camera in screenspaceimage
|
2016-03-16 09:19:28 -04:00 |
|
|
Jonathas Costa
|
7e34f226ba
|
CMake default module conf for NewHorizons.
|
2016-03-16 09:17:28 -04:00 |
|