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

Jump to bottom

feat: adapt d3-force-3d layout #214

Merged
merged 4 commits into from
Apr 10, 2024
Merged

feat: adapt d3-force-3d layout #214

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dfcf880
chore: use swc jest
Aarebecca Apr 9, 2024
655e2af
feat: adapt d3-force-3d
Aarebecca Apr 9, 2024
58d6e0d
refactor: refactor d3 force
Aarebecca Apr 9, 2024
1f81cba
test: update demo
Aarebecca Apr 9, 2024
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
221 changes: 221 additions & 0 deletions demo/d3-force-3d.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,221 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta
name="viewport"
content="width=device-width,initial-scale=1,shrink-to-fit=no"
/>
<title>D3Force</title>
<style>
* {
box-sizing: border-box;
margin: 0;
padding: 0;
}

html,
body {
height: 100%;
}

#container {
width: 100%;
height: 100%;
}
</style>
</head>

<body>
<div id="container"></div>
<script
src="https://unpkg.com/@antv/g"
type="application/javascript"
></script>
<script
src="https://unpkg.com/@antv/g-webgl"
type="application/javascript"
></script>
<script
src="https://unpkg.com/@antv/g-plugin-3d"
type="application/javascript"
></script>
<script
src="https://unpkg.com/@antv/g-plugin-control"
type="application/javascript"
></script>
<script
src="https://unpkg.com/@antv/graphlib@2.0.0"
type="application/javascript"
></script>
<script
src="../packages/layout/dist/index.min.js"
type="application/javascript"
></script>
<script>
const { Graph } = window.GraphLib;
const { D3Force3DLayout } = window.Layout;
const { Line, Canvas } = window.G;
const { SphereGeometry, MeshPhongMaterial, Mesh, DirectionalLight } =
window.G['3D'];

const spectral = [
'rgb(158, 1, 66)',
'rgb(213, 62, 79)',
'rgb(244, 109, 67)',
'rgb(253, 174, 97)',
'rgb(254, 224, 139)',
'rgb(255, 255, 191)',
'rgb(230, 245, 152)',
'rgb(171, 221, 164)',
'rgb(102, 194, 165)',
'rgb(50, 136, 189)',
'rgb(94, 79, 162)',
];

fetch('https://assets.antv.antgroup.com/g6/d3-force-3d.json')
.then((res) => res.json())
.then((data) => {
const renderer = new window.G.WebGL.Renderer();
const plugin = new window.G.Control.Plugin();
renderer.registerPlugin(plugin);

const width = 500;
const height = 500;

// create a canvas
const canvas = new Canvas({
container: 'container',
width: 500,
height: 500,
renderer: renderer,
});

canvas.appendChild(
new DirectionalLight({
style: {
fill: 'white',
direction: [-1, 0, 1],
},
}),
);
const camera = canvas.getCamera();
camera.setPerspective(0.1, 5000, 45, 1);

const graph = new Graph({
nodes: data.nodes,
edges: data.edges.map((edge, i) => ({ id: i, ...edge })),
});

const force = new D3Force3DLayout();

let rendered = false;
const nodes = [];
const edges = [];

const createNodesEdges = (positions) => {
positions.edges.forEach(({ source, target }, i) => {
const sourceNode = positions.nodes.find(
({ id }) => id === source,
);
const targetNode = positions.nodes.find(
({ id }) => id === target,
);
const line = new Line({
style: {
x1: sourceNode.data.x,
y1: sourceNode.data.y,
z1: sourceNode.data.z,
x2: targetNode.data.x,
y2: targetNode.data.y,
z2: targetNode.data.z,
lineWidth: 1,
stroke: 'grey',
isBillboard: true,
},
});
canvas.appendChild(line);
edges.push(line);
});

const plugin = renderer.getPlugin('device-renderer');
const device = plugin.getDevice();

const geometry = new SphereGeometry(device, {
radius: 5,
latitudeBands: 32,
longitudeBands: 32,
});
const material = new MeshPhongMaterial(device, {
shininess: 30,
});

positions.nodes.forEach((node, i) => {
const sphere = new Mesh({
style: {
x: node.data.x,
y: node.data.y,
z: node.data.z,
fill: spectral[node.data.group],
opacity: 1,
geometry,
material,
cursor: 'pointer',
},
});

canvas.appendChild(sphere);
nodes.push(sphere);
});
};

const updateNodesEdges = (positions) => {
positions.edges.forEach(({ source, target }, i) => {
const sourceNode = positions.nodes.find(
({ id }) => id === source,
);
const targetNode = positions.nodes.find(
({ id }) => id === target,
);

edges[i].attr({
x1: sourceNode.data.x,
y1: sourceNode.data.y,
z1: sourceNode.data.z,
x2: targetNode.data.x,
y2: targetNode.data.y,
z2: targetNode.data.z,
});
});

positions.nodes.forEach((node, i) => {
nodes[i].attr({
x: node.data.x,
y: node.data.y,
z: node.data.z,
});
});
};

(async () => {
await force.assign(graph, {
nodeSize: 20,
center: {
x: width / 2,
y: height / 2,
z: 0,
},
onTick: (positions) => {
if (!rendered) {
createNodesEdges(positions);
rendered = true;
} else {
updateNodesEdges(positions);
}
},
});
})();
});
</script>
</body>
</html>
20 changes: 1 addition & 19 deletions jest.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,3 @@
// module.exports = {

// preset: "ts-jest",
// collectCoverage: false,
// collectCoverageFrom: [
// "packages/layout/src/**/*.{ts,js}",
// "!**/node_modules/**",
// "!**/vendor/**",
// ],

/** @type {import('ts-jest').JestConfigWithTsJest} */
module.exports = {
testEnvironment: 'jsdom',
testRegex: '__tests__/.*test\\.ts?$',
Expand All @@ -19,13 +8,6 @@ module.exports = {
'@antv/layout/(.*)': '<rootDir>/src/$1',
},
transform: {
// '^.+\\.[tj]sx?$' to process js/ts with `ts-jest`
// '^.+\\.m?[tj]sx?$' to process js/ts/mjs/mts with `ts-jest`
'^.+\\.tsx?$': [
'ts-jest',
{
diagnostics: false,
},
],
'^.+\\.tsx?$': ['@swc/jest'],
},
};
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,8 @@
"@babel/preset-env": "^7.24.0",
"@babel/preset-typescript": "^7.23.3",
"@changesets/cli": "^2.27.1",
"@swc/core": "^1.4.12",
"@swc/jest": "^0.2.36",
"@types/jest": "latest",
"babel-jest": "29.7.0",
"babel-loader": "^8.3.0",
Expand All @@ -74,7 +76,6 @@
"prettier-plugin-organize-imports": "^3.2.4",
"rimraf": "^3.0.2",
"seedrandom": "^3.0.5",
"ts-jest": "^29.1.2",
"ts-loader": "^8.4.0",
"typescript": "^4.9.5",
"vite": "^4.5.2"
Expand Down
Loading
Loading