Skip to content

Commit 004873a

Browse files
authored
Merge pull request #692 from materialsproject/revert-561-tiling
Revert "Add tiling to CrystalToolkitScene"
2 parents 3e1f492 + b748568 commit 004873a

File tree

11 files changed

+254
-1102
lines changed

11 files changed

+254
-1102
lines changed

.babelrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33
"plugins": [
44
"@babel/transform-runtime"
55
]
6-
}
6+
}

package-lock.json

Lines changed: 0 additions & 68 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@
4444
"react": "^16.14.0",
4545
"react-aria-menubutton": "^7.0.1",
4646
"react-collapsible": "^2.8.3",
47-
"react-compound-slider": "^3.4.0",
4847
"react-data-table-component": "^6.11.6",
4948
"react-dom": "^16.14.0",
5049
"react-graph-vis": "^1.0.5",

src/app.tsx

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import { Sandbox } from './pages/Sandbox';
2222
import { SynthesisExplorer } from './pages/SynthesisExplorer';
2323
import { MPContribsSearch } from './pages/MPContribsSearch';
2424
import { CatalystExplorer } from './pages/CatalystExplorer';
25-
import { TilingVisualization } from './pages/TilingVisualization';
2625
import { Navbar } from './components/navigation/Navbar';
2726
import periodicTableImage from './assets/images/periodictable.png';
2827
import { MofExplorer } from './pages/MofExplorer';
@@ -46,7 +45,6 @@ ReactDOM.render(
4645
<Link to="/phasediagram">Phase Diagram</Link>
4746
<Link to="/contribs">Contributions</Link>
4847
<Link to="/crystal">Crystal Structure</Link>
49-
<Link to="/tiling">Tiling Visualization</Link>
5048
<Link to="/sandbox">Sandbox</Link>
5149
</div>
5250
<section>
@@ -87,9 +85,6 @@ ReactDOM.render(
8785
<Route path="/matscholar">
8886
<MatscholarMaterialsExplorer />
8987
</Route>
90-
<Route path="/tiling">
91-
<TilingVisualization />
92-
</Route>
9388
<Route path="/">
9489
<MaterialsExplorer />
9590
</Route>

src/components/crystal-toolkit/CrystalToolkitScene/CrystalToolkitScene.tsx

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -107,14 +107,6 @@ export interface CrystalToolkitSceneProps {
107107
*/
108108
settings?: any;
109109

110-
/**
111-
* the dynamic tiling, to be updated in scene.
112-
*/
113-
tiling?: number[];
114-
/**
115-
* the maximum size of the tiling, controls render size
116-
*/
117-
maxTiling?: number;
118110
/**
119111
* Hide/show nodes in scene by its name (key), value is 1 to show the node
120112
* and 0 to hide it.
@@ -379,8 +371,6 @@ export const CrystalToolkitScene: React.FC<CrystalToolkitSceneProps> = ({
379371
props.settings,
380372
props.inletSize,
381373
props.inletPadding,
382-
props.tiling,
383-
props.maxTiling,
384374
(objects) => {
385375
if (props.onObjectClicked) {
386376
props.onObjectClicked(objects);
@@ -443,9 +433,6 @@ export const CrystalToolkitScene: React.FC<CrystalToolkitSceneProps> = ({
443433
() => scene.current!.updateInsetSettings(props.inletSize!, props.inletPadding!, props.axisView),
444434
[props.inletSize, props.inletPadding, props.axisView]
445435
);
446-
useEffect(() => {
447-
scene.current!.updateTiles(props.tiling);
448-
}, [props.tiling]);
449436

450437
useEffect(() => {
451438
scene.current!.resizeRendererToDisplaySize();

0 commit comments

Comments
 (0)