Skip to content
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

Make view crisp whichever the zoom level #688

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Make view crisp whichever the zoom level #688

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
046ac6d
Make view crisp whichever the zoom level
martinRenou Feb 13, 2025
762d1a7
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Feb 13, 2025
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 packages/base/src/3dview/helpers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ export function buildShape(options: {
const edgesMeshes: LineSegments2[] = [];
for (const edge of edgeList) {
const edgeMaterial = new LineMaterial({
linewidth: DEFAULT_LINEWIDTH,
linewidth: DEFAULT_LINEWIDTH / window.devicePixelRatio,
color: new THREE.Color(DEFAULT_EDGE_COLOR).getHex(),
clippingPlanes,
// Depth offset so that lines are most always on top of faces
Expand Down
23 changes: 17 additions & 6 deletions packages/base/src/3dview/mainview.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,11 +277,12 @@ export class MainView extends React.Component<IProps, IStates> {
});

this._clock = new THREE.Clock();
// this._renderer.setPixelRatio(window.devicePixelRatio);
this._renderer.autoClear = false;
this._renderer.setClearColor(0x000000, 0);
this._renderer.setSize(500, 500, false);
this._divRef.current.appendChild(this._renderer.domElement); // mount using React ref
this._renderer.domElement.style.width = '100%';
this._renderer.domElement.style.height = '100%';

this._syncPointer = throttle(
(position: THREE.Vector3 | undefined, parent: string | undefined) => {
Expand Down Expand Up @@ -605,11 +606,17 @@ export class MainView extends React.Component<IProps, IStates> {

resizeCanvasToDisplaySize = (): void => {
if (this._divRef.current !== null) {
const pixelRatio = window.devicePixelRatio;

console.log('current pixel ratio', pixelRatio);

this._renderer.setPixelRatio(pixelRatio);
this._renderer.setSize(
this._divRef.current.clientWidth,
this._divRef.current.clientHeight,
this._divRef.current.clientWidth * pixelRatio,
this._divRef.current.clientHeight * pixelRatio,
false
);

if (this._camera instanceof THREE.PerspectiveCamera) {
this._camera.aspect =
this._divRef.current.clientWidth / this._divRef.current.clientHeight;
Expand All @@ -619,7 +626,10 @@ export class MainView extends React.Component<IProps, IStates> {
this._camera.top = this._divRef.current.clientHeight / 2;
this._camera.bottom = this._divRef.current.clientHeight / -2;
}

this._camera.updateProjectionMatrix();

this._createViewHelper();
}
};

Expand Down Expand Up @@ -937,7 +947,8 @@ export class MainView extends React.Component<IProps, IStates> {
} else {
if (objColor && el.material?.color) {
el.material.color = originalEdgeColor;
el.material.linewidth = DEFAULT_LINEWIDTH;
el.material.linewidth =
DEFAULT_LINEWIDTH / window.devicePixelRatio;
el.userData.originalColor = originalEdgeColor.clone();
}
}
Expand Down Expand Up @@ -1225,7 +1236,7 @@ export class MainView extends React.Component<IProps, IStates> {
linewidth?: number;
};
if (material?.linewidth) {
material.linewidth = DEFAULT_LINEWIDTH;
material.linewidth = DEFAULT_LINEWIDTH / window.devicePixelRatio;
}
}

Expand Down Expand Up @@ -1617,7 +1628,7 @@ export class MainView extends React.Component<IProps, IStates> {
// Draw lines
const material = new THREE.LineBasicMaterial({
color: DEFAULT_EDGE_COLOR,
linewidth: DEFAULT_LINEWIDTH
linewidth: DEFAULT_LINEWIDTH / window.devicePixelRatio
});
const geometry = new THREE.BufferGeometry().setFromPoints([
explodedState.oldGeometryCenter,
Expand Down
Loading