Skip to content
Snippets Groups Projects
Commit 16366aae authored by Michael Heyde's avatar Michael Heyde
Browse files

fixed refinement bug

parent d9ae5e46
No related branches found
No related tags found
No related merge requests found
......@@ -36,23 +36,28 @@ public class IsoSurfaceVolumeInterpreter extends AbstractVolumeInterpreter {
" return xNew;",
"}",
"",
"vec4[2] refineIntersection(float fNear, float fFar, vec3 xNear, vec3 xFar, float isoValue/*, sampler3D volume, vec3 texOffset, vec3 texfactor*/){",
"vec4[2] refineIntersection(float fNear, float fFar, vec3 xNear, vec3 xFar, float isoValue){",
" vec4[2] refined;",
" float formerDistance = "+Float.MAX_VALUE+";//min(distance(isoValue,fNear),distance(isoValue,fFar));",
" bool nearInlowerIso = (fNear < isoValue);",
" for(int i =0; i < refSteps; i++){",
" vec3 xNew = bisection(fNear,fFar,xNear,xFar,isoValue); ",
" vec3 xNew = bisection(fNear,fFar,xNear,xFar,isoValue);",
" float fNew = getValue(xNew);",
" float currentDistance = distance(isoValue,fNew);",
" if(currentDistance > formerDistance){",
" break;",
" }",
" formerDistance = currentDistance;",
" if(fNew > isoValue ){",
" xNear = xNew;",
" fNear = fNew;",
" if(nearInlowerIso){",
" xFar = xNew;",
" fFar = fNew;",
" }else{",
" xNear = xNew;",
" fNear = fNew;",
" }",
" }else{",
" xFar = xNew;",
" fFar = fNew;",
" if(nearInlowerIso){",
" xNear = xNew;",
" fNear = fNew;",
" }else{",
" xFar = xNew;",
" fFar = fNew;",
" }",
" }",
" }",
" refined[0].xyz = xNear;",
......@@ -89,8 +94,6 @@ public class IsoSurfaceVolumeInterpreter extends AbstractVolumeInterpreter {
" vec4 xFar = vec4("+sgvRayPositions+".xyz,1.0);",
"",
" vec4 refined[2]= refineIntersection(vm1,v,xNear.xyz,xFar.xyz,"+sgvNormIsoValue+");",
//" refined[0] = vec4(c_in.rgb,vm1);",
//" refined[1] = vec4(c.rgb,v);",
"",
" if(refined[0].a < 0.0){",
" color.a=-1.0;",
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment