Alexander Bock
1689dc4047
Move the PropertyOwner name specification into the constructor and adjust accordingly
2017-03-02 18:25:13 -05:00
Alexander Bock
2f2fa3b031
Update Ghoul repository to have the factory return unique_ptrs
...
Adjust accordingly
2017-03-01 22:03:48 -05:00
Alexander Bock
8fd60ce8e6
- Remove documentation.h include and replace with forward declaration
...
- Move Documentation struct into documentation namespace
2017-03-01 18:13:15 -05:00
Alexander Bock
94e3e11188
Update copyright header to 2017
...
Update Ghoul repository
Remove libgdal link
2017-02-06 18:02:01 -05:00
Emil Axelsson
cd325686ad
Merge branch 'develop' of github.com:OpenSpace/OpenSpace into feature/parallelconnection
...
Conflicts:
include/openspace/engine/openspaceengine.h
src/engine/openspaceengine.cpp
src/interaction/interactionhandler.cpp
src/network/parallelconnection.cpp
src/scripting/scriptengine.cpp
2016-09-22 19:33:05 +02:00
Alexander Bock
8867b3439f
Add central location for the core to register documentations
...
Add documentation to ScreenSpaceRenderable
Add documentation to Ephemeris
Add documentation to Rotation
2016-09-19 14:03:42 +02:00
Emil Axelsson
13610b390d
distinguish between local and remote scripting
2016-09-16 14:53:20 +02:00
Alexander Bock
0c3b2c55d9
Removing more CppCheck warnings
2016-07-28 20:31:53 +02:00
Alexander Bock
9fb7814145
Add visibility toggle to Property base class
...
Restructure GuiPropertyComponent to take a source function that returns a list of PropertyOwner%s instead of registering individual properties
Apply restructuring
2016-06-28 14:50:53 +02:00
Alexander Bock
77c8ecf6df
Rename screnspace* to screenspace shaders
2016-06-16 01:02:13 +02:00
Alexander Bock
ad1893fd6f
Cleanup of ScreenSpaceRenderable
...
Add missing includes to other files
2016-06-16 01:00:10 +02:00
Michael Nilsson
b3f1f12a40
add scene orientation to screenspacerenderables
2016-06-14 13:54:21 -04:00
Sebastian Piwell
1e4e8919c3
Set attributes of screenspacerenderable through dictionary
2016-05-03 15:35:33 -04:00
Michael Nilsson
c34fa48c73
add script to remove screenspacerenderables from renderengine
2016-05-03 13:30:22 -04:00
Michael Nilsson
4d61694f75
ScreenSpaceRenderables can be creates through scripts, ScreenSpaceRenderable is now a factory
2016-05-03 10:39:32 -04:00
Michael Nilsson
aa40e3a8b3
fix bug where screenspace cygnets crash program if moved to fast
2016-05-02 10:03:07 -04:00
Sebastian Piwell
434f8bfabb
Some clean up and small fixes
2016-04-27 14:48:22 -04:00
Michael Nilsson
c72536fbbc
untabify to make merge easier
2016-04-20 15:21:30 -04:00
Sebastian Piwell
b1a009e1b0
Create ISWACygnets with metadata struct
2016-04-05 11:44:49 -04:00
Sebastian Piwell
453fbe300e
Remove screenspacerenderables in any order
2016-04-04 15:40:45 -04:00
Sebastian Piwell
3fbfb9bb33
Remove screenspacerenderables
2016-04-04 13:49:21 -04:00
Sebastian Piwell
79979fe8dd
Clean up
2016-03-31 14:53:42 -04:00
Sebastian Piwell
a2fb30b432
Depth working again
2016-03-31 09:39:05 -04:00
Michael Nilsson
d390a70fb6
solve merge conflict
2016-03-30 09:51:34 -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
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
31f1e91b06
Tests for screenSpaceFramebuffer
2016-03-17 15:38:21 -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
fd5a3a7a1f
fix issue with abufferrenderer not working with screenspacerenderables
2016-03-16 16:38:05 -04:00
Sebastian Piwell
e6aca4b836
Spherical and Euclidean coordinate update each other
2016-03-16 11:47:53 -04:00
Sebastian Piwell
6bea326151
Correct euclidean to spherical conversion
2016-03-16 09:09:22 -04:00
Sebastian Piwell
2a110768c8
Better test mouse controls for screenspaceimages
2016-03-15 09:21:17 -04:00
Sebastian Piwell
34ca17563f
Occlussion for fisheye and singel_two_win
2016-03-11 18:51:10 -05:00
Sebastian Piwell
cfd68f2921
ScreenSpaceImage occlussion
2016-03-11 17:08:05 -05: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
afc3883d4d
Flat screen property
2016-03-10 13:01:05 -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
aef82d5c9e
create screenspacerenderable
2016-03-08 15:11:59 -05:00