LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

minor fixes

Browse source
This commit is contained in:
btzr-io 2018-06-09 14:33:31 -06:00 committed by Sean Yesmunt
parent 31ec889565
commit 87ffac9a52
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/renderer/component/threeViewer/index.jsx
View file

@ -50,6 +50,7 @@ class ThreeViewer extends React.PureComponent<Props> {
}, },
}; };
// Select current theme
const { theme } = this.props; const { theme } = this.props;
this.theme = this.themes[theme] || this.themes.light; this.theme = this.themes[theme] || this.themes.light;
} }
@ -102,9 +103,13 @@ class ThreeViewer extends React.PureComponent<Props> {
material.color.set(this.materialColors.green); material.color.set(this.materialColors.green);
const mesh = new THREE.Mesh(geometry, material); const mesh = new THREE.Mesh(geometry, material);
// Assign name
mesh.name = 'objectGroup'; mesh.name = 'objectGroup';
this.scene.add(mesh); this.scene.add(mesh);
this.fitMeshToCamera(mesh); this.fitMeshToCamera(mesh);
this.createWireFrame(mesh);
this.setControlsTarget(mesh.position); this.setControlsTarget(mesh.position);
return mesh; return mesh;
} }
@ -112,7 +117,6 @@ class ThreeViewer extends React.PureComponent<Props> {
toggleWireFrame(show = false) { toggleWireFrame(show = false) {
this.wireframe.opacity = show ? 1 : 0; this.wireframe.opacity = show ? 1 : 0;
this.mesh.material.opacity = show ? 0 : 1; this.mesh.material.opacity = show ? 0 : 1;
//this.mesh.material.shading(THREE.FlatShading);
} }
fitMeshToCamera(group) { fitMeshToCamera(group) {
@ -142,7 +146,6 @@ class ThreeViewer extends React.PureComponent<Props> {
group.position.y = meshY / 2 * scaleFactor; group.position.y = meshY / 2 * scaleFactor;
group.position.multiplyScalar(-1); group.position.multiplyScalar(-1);
group.position.y += meshY * scaleFactor; group.position.y += meshY * scaleFactor;
this.createWireFrame(group);
} }
setControlsTarget(point) { setControlsTarget(point) {
@ -168,7 +171,6 @@ class ThreeViewer extends React.PureComponent<Props> {
handleReady() { handleReady() {
// Handle load ready // Handle load ready
this.setState({ isReady: true, isLoading: false }); this.setState({ isReady: true, isLoading: false });
this.toggleWireFrame();
} }
handleResize = () => { handleResize = () => {
@ -184,7 +186,8 @@ class ThreeViewer extends React.PureComponent<Props> {
} }
handleProgress(url, currentItem, totalItems) { handleProgress(url, currentItem, totalItems) {
/// Handle progress // Handle progress
// TODO: Show progressbar...
} }
handleColorChange(color) { handleColorChange(color) {
@ -242,6 +245,7 @@ class ThreeViewer extends React.PureComponent<Props> {
window.addEventListener('resize', this.handleResize, false); window.addEventListener('resize', this.handleResize, false);
} else { } else {
// No webgl support, handle Error... // No webgl support, handle Error...
// TODO: Use a better error message
this.state({ error: 'No webgl support!' }); this.state({ error: 'No webgl support!' });
} }
} }