Michael Nilsson 2f7d2e294f solve merge conflict

2016-05-03 13:37:19 -04:00

..

colorbar.cpp

loading image cygnets from localhost

2016-04-19 09:54:18 -04:00

colorbar.h

Better transferfunction control

2016-04-14 11:37:10 -04:00

cygnetplane.cpp

Filter out background values

2016-04-28 17:40:04 -04:00

cygnetplane.h

Multiple textures and transferfunctions

2016-04-28 15:56:06 -04:00

dataplane.cpp

Chose ISWAGroup in GUI

2016-05-03 11:06:17 -04:00

dataplane.h

Merge fix

2016-05-02 17:34:10 -04:00

iswacontainer.cpp

Lua script to add cygnet

2016-05-03 13:24:17 -04:00

iswacontainer.h

ISWAGroup for manipulation of multiple dataplanes

2016-05-02 17:32:25 -04:00

iswacygnet.cpp

ISWAGroup for manipulation of multiple dataplanes

2016-05-02 17:32:25 -04:00

iswacygnet.h

Replaced string with enum

2016-05-03 10:06:47 -04:00

iswagroup.cpp

Chose ISWAGroup in GUI

2016-05-03 11:06:17 -04:00

iswagroup.h

Replaced string with enum

2016-05-03 10:06:47 -04:00

kameleonplane.cpp

Multiple textures and transferfunctions

2016-04-28 15:56:06 -04:00

kameleonplane.h

Multiple textures and transferfunctions

2016-04-28 15:56:06 -04:00

screenspacecygnet.cpp

add script to remove screenspacerenderables from renderengine

2016-05-03 13:30:22 -04:00

screenspacecygnet.h

ScreenSpaceRenderables can be creates through scripts, ScreenSpaceRenderable is now a factory

2016-05-03 10:39:32 -04:00

textureplane.cpp

Multiple textures and transferfunctions

2016-04-28 15:56:06 -04:00

textureplane.h

Multiple textures and transferfunctions

2016-04-28 15:56:06 -04:00