Skip to content

Volumes have timeratio now #444

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

Merged
TheJeran merged 1 commit into from
Dec 3, 2025
Merged

Volumes have timeratio now #444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions src/components/plots/AxisLines.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ const CubeAxis = ({flipX, flipY, flipDown}: {flipX: boolean, flipY: boolean, fli

const depthRatio = useMemo(()=>dataShape[0]/dataShape[2]*timeScale,[dataShape, timeScale]);
const shapeRatio = useMemo(()=>dataShape[1]/dataShape[2], [dataShape])
const timeRatio = Math.max(dataShape[0]/dataShape[2], 2);

const secondaryColor = useCSSVariable('--text-plot') //replace with needed variable
const colorHex = useMemo(()=>{
Expand All @@ -89,7 +90,7 @@ const CubeAxis = ({flipX, flipY, flipDown}: {flipX: boolean, flipY: boolean, fli
return new LineSegments2(geom, lineMat)},[yRange, shapeRatio, lineMat, globalScale])

const zLine = useMemo(()=> {
const geom = new LineSegmentsGeometry().setPositions([0, 0, isPC ? zRange[0]*globalScale*depthRatio-tickLength/2 : zRange[0]-tickLength/2, 0, 0, isPC ? zRange[1]*globalScale*depthRatio+tickLength/2 : zRange[1]+tickLength/2]);
const geom = new LineSegmentsGeometry().setPositions([0, 0, isPC ? zRange[0]*globalScale*depthRatio-tickLength/2 : (zRange[0]*timeRatio-tickLength)/2, 0, 0, isPC ? zRange[1]*globalScale*depthRatio+tickLength/2 : (zRange[1]*timeRatio+tickLength)/2]);
return new LineSegments2(geom, lineMat)},[zRange, depthRatio, isPC, lineMat, globalScale])

const tickLine = useMemo(()=> {
Expand All @@ -112,7 +113,7 @@ const CubeAxis = ({flipX, flipY, flipDown}: {flipX: boolean, flipY: boolean, fli
{/* Horizontal Group */}
<group position={[0, isPC ? shapeRatio*globalScale*yRange[0] : shapeRatio*yRange[0], 0]} >
{/* X Group */}
<group position={[0, 0, flipX ? isPC ? zRange[0]*depthRatio*(globalScale)-tickLength/2 : zRange[0]-tickLength/2 : isPC ? zRange[1] * (globalScale) * depthRatio +tickLength/2 : zRange[1]+tickLength/2]} rotation={[flipDown ? flipX ? -Math.PI/2 : Math.PI/2 : 0, 0, 0]}>
<group position={[0, 0, flipX ? isPC ? zRange[0]*depthRatio*(globalScale)-tickLength/2 : (zRange[0]*timeRatio-tickLength)/2 : isPC ? zRange[1] * (globalScale) * depthRatio +tickLength/2 : (zRange[1]*timeRatio+tickLength)/2]} rotation={[flipDown ? flipX ? -Math.PI/2 : Math.PI/2 : 0, 0, 0]}>
<primitive key={'xLine'} object={xLine} />
{Array(xResolution).fill(null).map((_val,idx)=>(
(((xRange[0] + 1)/2) <= (idx*xDimScale)/xResolution &&
Expand Down Expand Up @@ -182,7 +183,7 @@ const CubeAxis = ({flipX, flipY, flipDown}: {flipX: boolean, flipY: boolean, fli
(((zRange[0] + 1)/2) <= (idx*zDimScale)/zResolution &&
((zRange[1] + 1)/2) >= (idx*zDimScale)/zResolution )
&&
<group key={`zGroup_${idx}`} position={[0, 0, isPC ? -depthRatio*globalScale + idx*zDimScale/(zResolution/2)*depthRatio*(globalScale) : -1 + idx*zDimScale/(zResolution/2)]}>
<group key={`zGroup_${idx}`} position={[0, 0, isPC ? -depthRatio*globalScale + idx*zDimScale/(zResolution/2)*depthRatio*(globalScale) : -0.5*timeRatio + idx*zDimScale/(zResolution/2)*timeRatio/2]}>
<primitive key={idx} object={tickLine.clone()} rotation={[0, flipY ? Math.PI/2 : -Math.PI/2 , 0]} />
<Text
key={`textY_${idx}`}
Expand Down Expand Up @@ -242,7 +243,7 @@ const CubeAxis = ({flipX, flipY, flipDown}: {flipX: boolean, flipY: boolean, fli
</group>
</group>
{/* Vertical Group */}
<group position={[flipY ? xRange[0]*globalScale - tickLength/2 : xRange[1]*globalScale + tickLength/2, 0, flipX ? isPC ? zRange[0]*depthRatio*(globalScale) - tickLength/2 : zRange[0] - tickLength/2 : isPC ? zRange[1]*depthRatio*(globalScale) + tickLength/2 : zRange[1] +tickLength/2]}>
<group position={[flipY ? xRange[0]*globalScale - tickLength/2 : xRange[1]*globalScale + tickLength/2, 0, flipX ? isPC ? zRange[0]*depthRatio*(globalScale) - tickLength/2 : (zRange[0]*timeRatio - tickLength)/2 : isPC ? zRange[1]*depthRatio*(globalScale) + tickLength/2 : (zRange[1]*timeRatio +tickLength)/2]}>
<primitive key={'yLine'} object={yLine} />
{Array(yResolution).fill(null).map((_val,idx)=>(
(((yRange[0] + 1)/2) <= (idx*yDimScale)/yResolution &&
Expand Down
5 changes: 3 additions & 2 deletions src/components/plots/DataCube.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ export const DataCube = ({ volTexture }: DataCubeProps ) => {
})))
const meshRef = useRef<THREE.Mesh>(null!);
const aspectRatio = shape.y/shape.x
const timeRatio = shape.z/shape.x;
const shaderMaterial = useMemo(()=>new THREE.ShaderMaterial({
glslVersion: THREE.GLSL3,
uniforms: {
Expand All @@ -49,7 +50,7 @@ export const DataCube = ({ volTexture }: DataCubeProps ) => {
cScale: {value: cScale},
threshold: {value: new THREE.Vector2(valueRange[0],valueRange[1])},
scale: {value: shape},
flatBounds:{value: new THREE.Vector4(-xRange[1],-xRange[0],zRange[0],zRange[1])},
flatBounds:{value: new THREE.Vector4(-xRange[1],-xRange[0],zRange[0] * timeRatio, zRange[1] * timeRatio)},
vertBounds:{value: new THREE.Vector2(yRange[0]*aspectRatio,yRange[1]*aspectRatio)},
steps: { value: quality },
animateProg: {value: animProg},
Expand Down Expand Up @@ -77,7 +78,7 @@ export const DataCube = ({ volTexture }: DataCubeProps ) => {
uniforms.cScale.value = cScale;
uniforms.threshold.value.set(valueRange[0], valueRange[1]);
uniforms.scale.value = shape;
uniforms.flatBounds.value.set(-xRange[1], -xRange[0], zRange[0], zRange[1]);
uniforms.flatBounds.value.set(-xRange[1], -xRange[0], zRange[0] * timeRatio, zRange[1] * timeRatio);
uniforms.vertBounds.value.set(yRange[0] * aspectRatio, yRange[1] * aspectRatio);
uniforms.steps.value = quality;
uniforms.animateProg.value = animProg;
Expand Down
5 changes: 3 additions & 2 deletions src/components/plots/Plot.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,9 @@ const Plot = ({ZarrDS}:{ZarrDS: ZarrDataset}) => {
else{
setIsFlat(false)
}
const shapeRatio = result.shape[shapeLength-2] / result.shape[shapeLength-1] * 2;
setShape(new THREE.Vector3(2, shapeRatio, 2));
const aspectRatio = result.shape[shapeLength-2] / result.shape[shapeLength-1];
const timeRatio = result.shape[shapeLength-3] / result.shape[shapeLength-1];
setShape(new THREE.Vector3(2, aspectRatio * 2, Math.max(timeRatio, 2)));
setDataShape(result.shape)
setShow(true)
setPlotOn(true)
Expand Down