Merge branch 'campvis-nx' of gitlab.lrz.de:weiss/campvis-nx into campvis-nx (1a7665e4) · Commits · CAMP / campvis-public

cmake/FindGlew.cmake

+10 −10

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@
		# win32: GLEW_LIBRARY_DEBUG, GLEW_LIBRARY_RELEASE, GLEW_DLL_DEBUG, GLEW_DLL_RELEASE, GLEW_LICENSE_FILE

		IF (WIN32)
		SET(GLEW_DIR "${CampvisHome}/ext/glew" CACHE PATH "If glew is not found, set this path")
		SET(GLEW_DIR "${CampvisHome}/ext/glew-2.0.0" CACHE PATH "If glew is not found, set this path")

		# SET(GLEW_DEFINITIONS "-DGLEW_STATIC")

		@@ -14,15 +14,15 @@ IF (WIN32)

		# set debug and release library
		IF(CAMPVIS_WIN32)
		SET(GLEW_LIBRARY_DEBUG "${GLEW_DIR}/lib/win32/glew32.lib")
		SET(GLEW_DLL_DEBUG "${GLEW_DIR}/lib/win32/glew32.dll")
		SET(GLEW_LIBRARY_RELEASE "${GLEW_DIR}/lib/win32/glew32.lib")
		SET(GLEW_DLL_RELEASE "${GLEW_DIR}/lib/win32/glew32.dll")
		SET(GLEW_LIBRARY_DEBUG "${GLEW_DIR}/lib/Release/Win32/glew32.lib")
		SET(GLEW_DLL_DEBUG "${GLEW_DIR}/bin/Release/Win32/glew32.dll")
		SET(GLEW_LIBRARY_RELEASE "${GLEW_DIR}/lib/Release/Win32/glew32.lib")
		SET(GLEW_DLL_RELEASE "${GLEW_DIR}/bin/Release/Win32/glew32.dll")
		ELSEIF(CAMPVIS_WIN64)
		SET(GLEW_LIBRARY_DEBUG "${GLEW_DIR}/lib/win64/glew32.lib")
		SET(GLEW_DLL_DEBUG "${GLEW_DIR}/lib/win64/glew32.dll")
		SET(GLEW_LIBRARY_RELEASE "${GLEW_DIR}/lib/win64/glew32.lib")
		SET(GLEW_DLL_RELEASE "${GLEW_DIR}/lib/win64/glew32.dll")
		SET(GLEW_LIBRARY_DEBUG "${GLEW_DIR}/lib/Release/x64/glew32.lib")
		SET(GLEW_DLL_DEBUG "${GLEW_DIR}/bin/Release/x64/glew32.dll")
		SET(GLEW_LIBRARY_RELEASE "${GLEW_DIR}/lib/Release/x64/glew32.lib")
		SET(GLEW_DLL_RELEASE "${GLEW_DIR}/bin/Release/x64/glew32.dll")
		ELSE()
		MESSAGE(FATAL_ERROR "Neither CAMPVIS_WIN32 nor CAMPVIS_WIN64 defined!")
		ENDIF(CAMPVIS_WIN32)
		@@ -31,7 +31,7 @@ IF (WIN32)
		SET(GLEW_LIBRARY debug ${GLEW_LIBRARY_DEBUG} optimized ${GLEW_LIBRARY_RELEASE})
		ENDIF(GLEW_LIBRARY_DEBUG AND GLEW_LIBRARY_RELEASE)

		SET(GLEW_LICENSE_FILE "${GLEW_DIR}/license.txt")
		SET(GLEW_LICENSE_FILE "${GLEW_DIR}/LICENSE.txt")

		ELSE (WIN32)
		FIND_PATH(

cmake/commonconf.cmake

+2 −2

Original line number	Diff line number	Diff line
		@@ -2,8 +2,8 @@ IF(NOT CommonconfProcessed)

		SET(CampvisHome ${CMAKE_CURRENT_SOURCE_DIR})
		SET(CampvisBinaryDir ${CMAKE_BINARY_DIR})
		MESSAGE(STATUS "TUMVis Source Directory: ${CampvisHome}")
		MESSAGE(STATUS "TUMVis Binary Directory: ${CampvisBinaryDir}")
		MESSAGE(STATUS "CAMPVis Source Directory: ${CampvisHome}")
		MESSAGE(STATUS "CAMPVis Binary Directory: ${CampvisBinaryDir}")

		# include macros
		INCLUDE(${CampvisHome}/cmake/macros.cmake)

cmake/macros.cmake

+5 −3

Original line number	Diff line number	Diff line
		@@ -291,16 +291,18 @@ MACRO(COPY_EXTERNAL_DLLS DebugDLLs ReleaseDLLs failOnError)
		ENDFOREACH()

		SET(release_dir "${CMAKE_BINARY_DIR}/bin/Release")
		SET(minsizerel_dir "${CMAKE_BINARY_DIR}/bin/MinSizeRel")
		SET(relwithdebinfo_dir "${CMAKE_BINARY_DIR}/bin/RelWithDebInfo")
		IF(NOT EXISTS ${release_dir})
		FILE(MAKE_DIRECTORY ${release_dir})
		ENDIF()
		FOREACH(dllPath ${${ReleaseDLLs}})
		IF(EXISTS ${dllPath})
		GET_FILENAME_COMPONENT(dllName ${dllPath} NAME)
		IF(EXISTS ${release_dir}/${dllName})
		FILE(REMOVE ${release_dir}/${dllName})
		ENDIF()

		FILE(COPY ${dllPath} DESTINATION ${release_dir})
		FILE(COPY ${dllPath} DESTINATION ${minsizerel_dir})
		FILE(COPY ${dllPath} DESTINATION ${relwithdebinfo_dir})
		ELSEIF(${failOnError})
		MESSAGE(FATAL_ERROR "Release DLL not found: ${dllPath}")
		ELSE()

core/datastructures/imagerepresentationgl.cpp

+0 −28

Original line number	Diff line number	Diff line
		@@ -99,37 +99,9 @@ namespace campvis {
		tempUnit.activate();
		_texture->bind();

		// map signed integer types from [-1.0:1.0] to [0.0:1.0] in order to avoid clamping of negative values
		if (wtp.isInteger() && wtp.isSigned()) {
		glPixelTransferf(GL_RED_SCALE, 0.5f);
		glPixelTransferf(GL_GREEN_SCALE, 0.5f);
		glPixelTransferf(GL_BLUE_SCALE, 0.5f);
		glPixelTransferf(GL_ALPHA_SCALE, 0.5f);

		glPixelTransferf(GL_RED_BIAS, 0.5f);
		glPixelTransferf(GL_GREEN_BIAS, 0.5f);
		glPixelTransferf(GL_BLUE_BIAS, 0.5f);
		glPixelTransferf(GL_ALPHA_BIAS, 0.5f);

		//_mappingInformation.setRealWorldMapping(LinearMapping<float>(.5f, .5f));
		}

		_texture->uploadTexture(reinterpret_cast<GLubyte*>(wtp._pointer), wtp.getGlFormat(), wtp.getGlDataType());
		_texture->setWrapping(cgt::Texture::CLAMP_TO_EDGE);

		if (wtp.isInteger() && wtp.isSigned()) {
		// restore default
		glPixelTransferf(GL_RED_SCALE, 1.0f);
		glPixelTransferf(GL_GREEN_SCALE, 1.0f);
		glPixelTransferf(GL_BLUE_SCALE, 1.0f);
		glPixelTransferf(GL_ALPHA_SCALE, 1.0f);

		glPixelTransferf(GL_RED_BIAS, 0.0f);
		glPixelTransferf(GL_GREEN_BIAS, 0.0f);
		glPixelTransferf(GL_BLUE_BIAS, 0.0f);
		glPixelTransferf(GL_ALPHA_BIAS, 0.0f);
		}

		cgt::TextureUnit::setZeroUnit();
		LGL_ERROR;
		}

core/pipeline/abstractpipeline.cpp

+0 −13

Original line number	Diff line number	Diff line
		@@ -239,20 +239,7 @@ namespace campvis {
		cgtAssert(cgt::getGlBool(GL_DEPTH_TEST) == false, "Invalid OpenGL state after processor execution, GL_DEPTH_TEST != false.");
		cgtAssert(cgt::getGlBool(GL_SCISSOR_TEST) == false, "Invalid OpenGL state after processor execution, GL_SCISSOR_TEST != false.");

		cgtAssert(cgt::getGlInt(GL_CULL_FACE_MODE) == GL_BACK, "Invalid OpenGL state after processor execution, GL_CULL_FACE_MODE != GL_BACk.");
		cgtAssert(cgt::getGlInt(GL_DEPTH_FUNC) == GL_LESS, "Invalid OpenGL state after processor execution, GL_DEPTH_FUNC != GL_LESS.");

		cgtAssert(cgt::getGlFloat(GL_DEPTH_CLEAR_VALUE) == 1.f, "Invalid OpenGL state after processor execution, GL_DEPTH_CLEAR_VALUE != 1.f.");

		cgtAssert(cgt::getGlFloat(GL_RED_SCALE) == 1.f, "Invalid OpenGL state after processor execution, GL_RED_SCALE != 1.f.");
		cgtAssert(cgt::getGlFloat(GL_GREEN_SCALE) == 1.f, "Invalid OpenGL state after processor execution, GL_GREEN_SCALE != 1.f.");
		cgtAssert(cgt::getGlFloat(GL_BLUE_SCALE) == 1.f, "Invalid OpenGL state after processor execution, GL_BLUE_SCALE != 1.f.");
		cgtAssert(cgt::getGlFloat(GL_ALPHA_SCALE) == 1.f, "Invalid OpenGL state after processor execution, GL_ALPHA_SCALE != 1.f.");

		cgtAssert(cgt::getGlFloat(GL_RED_BIAS) == 0.f, "Invalid OpenGL state after processor execution, GL_RED_BIAS != 0.f.");
		cgtAssert(cgt::getGlFloat(GL_GREEN_BIAS) == 0.f, "Invalid OpenGL state after processor execution, GL_GREEN_BIAS != 0.f.");
		cgtAssert(cgt::getGlFloat(GL_BLUE_BIAS) == 0.f, "Invalid OpenGL state after processor execution, GL_BLUE_BIAS != 0.f.");
		cgtAssert(cgt::getGlFloat(GL_ALPHA_BIAS) == 0.f, "Invalid OpenGL state after processor execution, GL_ALPHA_BIAS != 0.f.");
		#endif
		}