various small improvement/fixes

core/datastructures/imagemappinginformation.cpp

@@ -59,17 +59,11 @@ namespace campvis {
     }
 
     void ImageMappingInformation::updateMatrices() {
-        tgt::mat4 t = tgt::mat4::createTranslation(_offset);
-//	tgt::mat4 s = tgt::mat4::createScale(_voxelSize * _size);
-//        _textureToWolrdTransformation = t * s;
         _textureToWolrdTransformation = tgt::mat4::createTranslation(_offset) * tgt::mat4::createScale(_voxelSize * _size);
-//	std::cout << s << t << _textureToWolrdTransformation << "\n";
         if (! _textureToWolrdTransformation.invert(_worldToTextureTransformation))
             tgtAssert(false, "Could not invert texture-to-world matrix. That should not happen!");
 
-	tgt::mat4 s = tgt::mat4::createScale(_voxelSize);
-        _voxelToWorldTransformation = t * s; 
-//	std::cout << s << t << _voxelToWorldTransformation << "\n";
+        _voxelToWorldTransformation = tgt::mat4::createTranslation(_offset) * tgt::mat4::createScale(_voxelSize);
         if (! _voxelToWorldTransformation.invert(_worldToVoxelTransformation))
             tgtAssert(false, "Could not invert voxel-to-world matrix. That should not happen!");
     }

core/pipeline/raycastingprocessor.cpp

@@ -48,7 +48,7 @@ namespace campvis {
         , p_exitImageID("exitImageID", "Input Exit Points Image", "", DataNameProperty::READ)
         , p_camera("camera", "Camera")
         , p_transferFunction("TransferFunction", "Transfer Function", new SimpleTransferFunction(256))
-        , p_jitterStepSizeMultiplier("jitterStepSizeMultiplier", "Jitter Step Size Multiplier", .5f, .1f, 1.f)
+        , p_jitterStepSizeMultiplier("jitterStepSizeMultiplier", "Jitter Step Size Multiplier", 1.f, 0.f, 1.f)
         , p_samplingRate("SamplingRate", "Sampling Rate", 2.f, 0.1f, 10.f, 0.1f)
         , _fragmentShaderFilename(fragmentShaderFileName)
         , _shader(0)

modules/columbia/pipelines/columbia1.cpp

@@ -140,7 +140,7 @@ namespace campvis {
         _sft.p_outputID.addSharedProperty(&_sfr.p_strainId);
 
         _sfr.p_renderTargetID.setValue("sfr");
-        _sfr.p_renderTargetID.addSharedProperty(static_cast<DataNameProperty*>(_vr.getProperty("GeometryImageId")));
+     //   _sfr.p_renderTargetID.addSharedProperty(static_cast<DataNameProperty*>(_vr.getProperty("GeometryImageId")));
         _sfr.p_renderTargetID.addSharedProperty(&_compositor.p_firstImageId);
     }
 

modules/vis/processors/simpleraycaster.cpp

@@ -41,7 +41,7 @@ namespace campvis {
         , p_targetImageID("targetImageID", "Output Image", "", DataNameProperty::WRITE)
         , p_enableShadowing("EnableShadowing", "Enable Hard Shadows (Expensive!)", false, AbstractProcessor::INVALID_RESULT | AbstractProcessor::INVALID_SHADER | AbstractProcessor::INVALID_PROPERTIES)
         , p_shadowIntensity("ShadowIntensity", "Shadow Intensity", .5f, .0f, 1.f)
-        , p_enableAdaptiveStepsize("EnableAdaptiveStepSize", "Enable Adaptive Step Size", true, AbstractProcessor::INVALID_SHADER)
+        , p_enableAdaptiveStepsize("EnableAdaptiveStepSize", "Enable Adaptive Step Size", true, AbstractProcessor::INVALID_RESULT | AbstractProcessor::INVALID_SHADER)
     {
         addDecorator(new ProcessorDecoratorShading());