Commit 792e2d52 authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Updated CMake build scripts:

Module file parsing now supports new fields "ThisModApplicationSources", "ThisModApplicationHeaders", and "ThisModApplicationToBeMocced". These files will be added to the campvis-application package (instead of to the campvis-modules package) and thus for instance allow a module to declare property widgets in a non-intrusive way.

Little bug fix in glvesselnessfilter.frag shader.
parent 146082b0
......@@ -64,6 +64,24 @@ SET(CampvisApplicationToBeMocced
tools/bufferinglog.h
)
# add additional sources from the activated modules
FOREACH(ModFile ${CampvisModulesApplicationSources})
# adjust relative path
SET(ModFileRelative ../modules/${ModFile})
LIST(APPEND CampvisApplicationSources ${ModFileRelative})
ENDFOREACH()
FOREACH(ModFile ${CampvisModulesApplicationHeaders})
# adjust relative path
SET(ModFileRelative ../modules/${ModFile})
LIST(APPEND CampvisApplicationHeaders ${ModFileRelative})
ENDFOREACH()
FOREACH(ModFile ${CampvisModulesApplicationToBeMocced})
# adjust relative path
SET(ModFileRelative ../modules/${ModFile})
LIST(APPEND CampvisApplicationToBeMocced ${ModFileRelative})
ENDFOREACH()
#
# Qt related stuff:
#
......
......@@ -89,6 +89,9 @@ MACRO(INCLUDE_MODULE ModuleDirectory ModuleListFile)
LIST(APPEND CampvisModulesHeaders ${ThisModHeaders})
LIST(APPEND CampvisModulesCoreSources ${ThisModCoreSources})
LIST(APPEND CampvisModulesCoreHeaders ${ThisModCoreHeaders})
LIST(APPEND CampvisModulesApplicationSources ${ThisModApplicationSources})
LIST(APPEND CampvisModulesApplicationHeaders ${ThisModApplicationHeaders})
LIST(APPEND CampvisModulesApplicationToBeMocced ${ThisModApplicationToBeMocced})
LIST(APPEND CampvisExternalDllsDebug ${ThisModExternalDllsDebug})
LIST(APPEND CampvisExternalDllsRelease ${ThisModExternalDllsRelease})
......@@ -116,6 +119,9 @@ MACRO(INCLUDE_MODULE ModuleDirectory ModuleListFile)
UNSET(ThisModHeaders)
UNSET(ThisModCoreSources)
UNSET(ThisModCoreHeaders)
UNSET(CampvisApplicationSources)
UNSET(CampvisApplicationHeaders)
UNSET(CampvisApplicationToBeMocced)
UNSET(ThisModExternalDllsDebug)
UNSET(ThisModExternalDllsRelease)
UNSET(ThisModShaderDirectories)
......
......@@ -103,7 +103,7 @@ void main() {
if (true || bitfieldExtract(l, 4, 1) != 0U) {
for (float lod = _lod.x; lod < _lod.y; lod += 0.5) {
float level_vesselness = computeVesselness(texCoords, lod);
vec4 level_vesselness = computeVesselness(texCoords, lod);
out_vesselness = max(out_vesselness, level_vesselness.x);
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment