Skip to content

MNT remove dead WebGL rendering code #763

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kroq-gar78 wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

MNT remove dead WebGL rendering code #763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a968eb7
MNT remove unused VolumeSheets from the WebGL viewer
kroq-gar78 Oct 9, 2026
b3376d3
MNT remove dead halo / volume-integration rendering and ShadowTex
kroq-gar78 Oct 9, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cortex/tests/test_webgl_shaders.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
# says the subject has a white matter surface; the rest come from the dataview
# and from the surface menu.
SURFACE_OPTS = dict(morphs=3, volume=1, layers=1, rois=True, extratex=False,
halo=False, dither=False, voxline=False, sampler="nearest")
dither=False, voxline=False, sampler="nearest")


def _surface_variants() -> Iterator[Any]:
Expand Down
2 changes: 0 additions & 2 deletions cortex/webgl/resources/js/axes3d.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,8 +308,6 @@ var jsplot = (function (module) {
scene = new THREE.Scene();
scene.add(this.camera);
scene.add(this.root);
// scene.fsquad = new THREE.Mesh(new THREE.PlaneGeometry(100, 100), null);
// scene.fsquad.position.z = -1.0001;
this.views.push({left:left, bottom:bottom, width:width, height:height, scene:scene});
}
}
Expand Down
155 changes: 0 additions & 155 deletions cortex/webgl/resources/js/mriview_surface.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,6 @@ var mriview = (function(module) {
smoothness: { type:'f', value:parseFloat(viewopts.smoothness)},
contrast: { type:'f', value:parseFloat(viewopts.contrast)},
extratex: { type:'t', value:null},

// screen: { type:'t', value:this.volumebuf},
// screen_size:{ type:'v2', value:new THREE.Vector2(100, 100)},
}
]);

Expand Down Expand Up @@ -346,14 +343,6 @@ var mriview = (function(module) {
};
THREE.EventDispatcher.prototype.apply(module.Surface.prototype);
module.Surface.prototype.resize = function(evt) {
// this.volumebuf = new THREE.WebGLRenderTarget(width, height, {
// minFilter: THREE.LinearFilter,
// magFilter: THREE.LinearFilter,
// format:THREE.RGBAFormat,
// stencilBuffer:false,
// });
// this.uniforms.screen.value = this.volumebuf;
// this.uniforms.screen_size.value.set(width, height);
this.width = evt.width;
this.height = evt.height;
this.loaded.done(function() {
Expand All @@ -366,37 +355,6 @@ var mriview = (function(module) {
this._active = dataview;

this.loaded.done(function() {
var shaders = [];
// Halo rendering code, ignore for now
// if (this.sheets.length > 1) { //setup meshes for halo rendering
// for (var i = 0; i < this.sheets.length; i++) {
// var shaders = dataview.getShader(Shaders.surface, this.uniforms, {
// morphs:this.names.length, volume:1, rois: false, halo: true });
// for (var j = 0; j < shaders.length; j++) {
// shaders[j].transparent = i != 0;
// shaders[j].depthTest = true;
// shaders[j].depthWrite = i == 0;
// shaders[j].uniforms.thickmix = {type:'f', value: 1 - i / (this.sheets.length-1)};
// shaders[j].blending = THREE.CustomBlending;
// shaders[j].blendSrc = THREE.OneFactor;
// shaders[j].blendDst = THREE.OneFactor;
// }
// this.preshaders.push(shaders);
// }
// var shaders = dataview.getShader(Shaders.surface, this.uniforms, {
// morphs:this.names.length, volume:1, rois:false, halo:false });
// for (var j = 0; j < shaders.length; j++) {
// shaders[j].uniforms.thickmix = {type:'f', value:1};
// shaders[j].uniforms.dataAlpha = {type:'f', value:0};
// }

// this.quadshade = dataview.getShader(Shaders.cmap_quad, this.uniforms);
// this.quadshade.transparent = true;
// this.quadshade.blending = THREE.CustomBlending
// this.quadshade.blendSrc = THREE.OneFactor
// this.quadshade.blendDst = THREE.OneMinusSrcAlphaFactor
// this.quadshade.depthWrite = false;
// } else {
if (dataview.vertex) {
var shade_cls = Shaders.surface_vertex;
} else {
Expand All @@ -409,7 +367,6 @@ var mriview = (function(module) {
layers: this._layers,
rois: this.svg instanceof svgoverlay.SVGOverlay,
extratex: this.uniforms.extratex.value !== null,
halo: false,
dither: this._dither,
nanmean: this._nanmean,
equivolume: this._equivolume,
Expand Down Expand Up @@ -442,30 +399,6 @@ var mriview = (function(module) {
}
}

// var oldcolor, black = new THREE.Color(0,0,0);
// module.Surface.prototype._prerender_halosurf = function(evt) {
// var idx = evt.idx, renderer = evt.renderer, scene = evt.scene, camera = evt.camera;
// camera.add(scene.fsquad);
// scene.fsquad.material = this.quadshade[idx];
// scene.fsquad.visible = false;
// for (var i = 0; i < this.sheets.length; i++) {
// this.sheets[i].left.material = this.preshaders[i][idx];
// this.sheets[i].right.material = this.preshaders[i][idx];
// this.sheets[i].left.visible = true;
// this.sheets[i].right.visible = true;
// }
// oldcolor = renderer.getClearColor()
// renderer.setClearColor(black, 0);
// //renderer.render(scene, camera);
// renderer.render(scene, camera, this.volumebuf);
// renderer.setClearColor(oldcolor, 1);
// for (var i = 1; i < this.sheets.length; i++) {
// this.sheets[i].left.visible = false;
// this.sheets[i].right.visible = false;
// }
// scene.fsquad.visible = true;
// };

module.Surface.prototype.apply = function(dataview) {
this.loaded.done(function() {
for (var i = 0; i < this.sheets.length; i++) {
Expand Down Expand Up @@ -960,93 +893,5 @@ var mriview = (function(module) {
this.surf.prerender(renderer, scene, camera);
}


module.VolumeSheets = function(dataview) {
if (dataview.vertex)
throw "Cannot show volume integration for vertex dataview"

this.shaders = {};
this.uniforms = THREE.UniformsUtils.merge( [
THREE.UniformsLib[ "lights" ],
{
diffuse: { type:'v3', value:new THREE.Vector3( 0,0,0 )},
specular: { type:'v3', value:new THREE.Vector3( 0,0,0 )},
emissive: { type:'v3', value:new THREE.Vector3( 1,1,1 )},
shininess: { type:'f', value:0},
specularStrength:{ type:'f', value:0},
dataAlpha: { type:'f', value:.1},
}]);

this.object = new THREE.Group();
this.object.name = 'VolumeSheets'
this.setSheets(30);
this.update(dataview);
}
THREE.EventDispatcher.prototype.apply(module.VolumeSheets.prototype);
module.VolumeSheets.prototype.update = function(dataview) {
var shaders = dataview.getShader(Shaders.main, this.uniforms, {
viewspace:true,
depthTest:true,
depthWrite:false,
blending:THREE.AdditiveBlending,
transparent:true,
lights:false,
});
this.shaders[dataview.uuid] = shaders[0];

//compute dataview extents to scale the sheets
var xfm = new THREE.Matrix4();
xfm.set.apply(xfm, dataview.xfm);
var ixfm = (new THREE.Matrix4()).getInverse(xfm);
var zsize = dataview.data[0].mosaic;
var shape = dataview.data[0].shape;
var near = (new THREE.Vector3(0,0,0)).applyMatrix4(ixfm);
var far = (new THREE.Vector3(shape[0], shape[1], zsize[0]*zsize[1])).applyMatrix4(ixfm);
var mid = near.clone().multiplyScalar(0.5).add(far.clone().multiplyScalar(.5));

var scale = near.distanceTo(far);
this.object.scale.set(scale/2, scale/2, scale/2);
this.object.position.set(mid.x, mid.y, mid.z);
}
module.VolumeSheets.prototype.apply = function(dataview) {
this.mesh.material = this.shaders[dataview.uuid];
//this.sheets.material = this.debug_shade;
}
module.VolumeSheets.prototype.setSheets = function(n) {
this.n_sheets = n;
this.uniforms.dataAlpha.value = 1 / n;
var position = new THREE.BufferAttribute(new Float32Array(4*3*n), 3);
var index = new THREE.BufferAttribute(new Uint16Array(2*3*n), 3);
var normal = new THREE.BufferAttribute(new Float32Array(4*3*n), 3);
for (var i = 0; i < n; i++) {
var z = ((2*i+1) / (2*n))*2 - 1;
position.setXYZ(i*4 , -1, -1, z);
position.setXYZ(i*4+1, 1, -1, z);
position.setXYZ(i*4+2, 1, 1, z);
position.setXYZ(i*4+3, -1, 1, z);
normal.setXYZ(i*4 , 0, 0, 1);
normal.setXYZ(i*4+1, 0, 0, 1);
normal.setXYZ(i*4+2, 0, 0, 1);
normal.setXYZ(i*4+3, 0, 0, 1);
index.setXYZ(i*2 , i*4, i*4+1, i*4+2);
index.setXYZ(i*2+1, i*4, i*4+2, i*4+3);
}
this.sheets = new THREE.BufferGeometry();
this.sheets.addAttribute("position", position);
this.sheets.addAttribute("index", index);
this.sheets.addAttribute("normal", normal);

this.debug_shade = new THREE.MeshBasicMaterial({color:0xffcccc,
side:THREE.DoubleSide,
transparent:true,
opacity:.1,
blending:THREE.AdditiveBlending,
depthTest:true,
depthWrite:false,
});
this.mesh = new THREE.Mesh(this.sheets, null);
this.object.add(this.mesh);
}

return module;
}(mriview || {}));
52 changes: 0 additions & 52 deletions cortex/webgl/resources/js/shaderlib.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,6 @@ var Shaderlib = (function() {
"const vec4 shift = vec4(1.0, 1. / 255., 1. / 65025., 1./160581375.0);",
"return dot(rgba, shift);",
"}",
"float decode_float_vec2(vec2 rg) {",
"const vec2 shift = vec2(1.0, 1. / 255.);",
"return dot(rg, shift);",
"}",

"vec4 pack_float( const in float depth ) {",
"const vec4 bit_shift = vec4( 256.0 * 256.0 * 256.0, 256.0 * 256.0, 256.0, 1.0 );",
Expand Down Expand Up @@ -392,11 +388,6 @@ var Shaderlib = (function() {
header += "#define ROI_RENDER\n";
if (opts.extratex)
header += "#define EXTRATEX\n"
if (opts.halo) {
if (opts.twod)
throw "Cannot use 2D colormaps with volume integration"
header += "#define HALO_RENDER\n";
}
if (opts.hasflat)
header += "#define HASFLAT\n"
if (opts.equivolume)
Expand Down Expand Up @@ -566,7 +557,6 @@ var Shaderlib = (function() {
utils.rand,
utils.edge,
utils.colormap,
utils.pack,
utils.samplers,

"void main() {",
Expand Down Expand Up @@ -717,19 +707,6 @@ var Shaderlib = (function() {
"#endif",
"#endif",
"}",
"#ifdef HALO_RENDER",
"if (vMedial < .999) {",
"float dweight = gl_FragCoord.w;",
"float value = dweight * vnorm(values).x;",

"gl_FragColor.rg = encode_float_vec2(value);",
"gl_FragColor.ba = encode_float_vec2(dweight);",
//"gl_FragColor = vec4(res / 256., 1. / 256.);",
//"gl_FragColor = vec4(vec3(gl_FragCoord.w), 1.);",
"} else if (surfmix > "+((morphs-2)/(morphs-1))+") {",
"gl_FragColor = vec4(0.);",
"}",
"#else",
"#ifdef RGBCOLORS",
"vec4 vColor = mix(color[0], color[1], framemix);",
"#else",
Expand Down Expand Up @@ -773,7 +750,6 @@ var Shaderlib = (function() {
"gl_FragColor = tColor + (1.-tColor.a)*gl_FragColor;",
"#endif",
THREE.ShaderChunk[ "lights_phong_fragment" ],
"#endif",
"}"
].join("\n");

Expand Down Expand Up @@ -1036,34 +1012,6 @@ var Shaderlib = (function() {
return {vertex:header+vertShade, fragment:header+fragShade, attrs:attributes};
},

cmap_quad: function() {
//Colormaps the full-screen quad, used for stage 2 of volume integration
var vertShade = [
"void main() {",
"gl_Position = projectionMatrix * modelViewMatrix * vec4( position, 1.0 );",
"}",
].join("\n");
var fragShade = [
utils.pack,
"uniform vec2 screen_size;",
"uniform sampler2D screen;",
"uniform sampler2D colormap;",
"void main() {",
"vec4 data = texture2D(screen, gl_FragCoord.xy / screen_size);",
"float value = decode_float_vec2(data.rg);",
"float raw = value / decode_float_vec2(data.ba);",
//"if (value.a > 0.) {",
"gl_FragColor = texture2D(colormap, vec2(raw, 0.));",
//"} else {",
// "discard;",
//"}",
//"gl_FragColor = vec4(vec3(raw), 1.);",
//"gl_FragColor = vec4(value.rgb, 1.);",
"}",
].join("\n");
return {vertex:vertShade, fragment:fragShade, attrs:{}};
},

pick: function(opts) {
var header = "";
var morphs = opts.morphs;
Expand Down
Loading
Loading