vmario/Doodle3D-Core
0
0
Fork 0
mirror of https://github.com/Doodle3D/Doodle3D-Core.git synced 2024-12-22 19:13:49 +01:00
Code Issues Projects Releases Wiki Activity

fix selecting 3d

Browse Source
This commit is contained in:
casperlamboo 2017-11-22 13:31:54 +01:00
parent bc9b6c356e
commit 0360c677c7
5 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/D3Panel.js
View File

@ -117,6 +117,7 @@ class D3Panel extends React.Component {
this.plane.rotation.x = Math.PI / 2; this.plane.rotation.x = Math.PI / 2;
this.plane.position.y = -0.01; this.plane.position.y = -0.01;
this.plane.name = 'bed-plane'; this.plane.name = 'bed-plane';
this.plane.isBedPlane = true;
this.scene.add(this.plane); this.scene.add(this.plane);
const directionalLight = new THREE.PointLight(0xffffff, 0.6); const directionalLight = new THREE.PointLight(0xffffff, 0.6);

2
src/d3/ShapeMesh.js vendored
View File

@ -38,6 +38,7 @@ class ShapeMesh extends THREE.Object3D {
this._mesh = new THREE.Mesh(new THREE.BufferGeometry(), material); this._mesh = new THREE.Mesh(new THREE.BufferGeometry(), material);
this._mesh.name = shapeData.UID; this._mesh.name = shapeData.UID;
this._mesh.isShapeMesh = true;
this.add(this._mesh); this.add(this._mesh);
this._toonShader = toonShader; this._toonShader = toonShader;
@ -61,6 +62,7 @@ class ShapeMesh extends THREE.Object3D {
this._holeMesh = new THREE.Mesh(new THREE.Geometry().fromBufferGeometry(this._mesh.geometry), material); this._holeMesh = new THREE.Mesh(new THREE.Geometry().fromBufferGeometry(this._mesh.geometry), material);
this._holeMesh.name = shapeData.UID; this._holeMesh.name = shapeData.UID;
this._holeMesh.isShapeMesh = true;
this.add(this._holeMesh); this.add(this._holeMesh);
this.updateSolid(solid, active); this.updateSolid(solid, active);

6
src/d3/transformers/BaseTransformer.js vendored
View File

@ -59,8 +59,8 @@ export default class BaseTransformer extends EventObject3D {
this.dispatch(actions.d3MultitouchEnd(positions)); this.dispatch(actions.d3MultitouchEnd(positions));
} }
select(intersections) { select(intersections) {
const mesh = intersections.find(({ object }) => object instanceof ShapeMesh); const mesh = intersections.find(({ object }) => object.isShapeMesh);
const bed = intersections.find(({ object }) => object.name === 'bed-plane'); const bed = intersections.find(({ object }) => object.isBedPlane);
if (mesh) { if (mesh) {
this.dispatch(actions.toggleSelect(mesh.object.name)); this.dispatch(actions.toggleSelect(mesh.object.name));
@ -132,7 +132,7 @@ export default class BaseTransformer extends EventObject3D {
} }
updateSpriteScale() { updateSpriteScale() {
for (const sprite of this.children) { for (const sprite of this.children) {
if (!(sprite instanceof SpriteHandle) || !sprite.material.map) continue; if (!(sprite.isUIHandle) || !sprite.material.map) continue;
const scale = sprite.position.distanceTo(this.camera.getWorldPosition()) / 2000.0; const scale = sprite.position.distanceTo(this.camera.getWorldPosition()) / 2000.0;
const { width, height } = sprite.material.map.image; const { width, height } = sprite.material.map.image;

2
src/d3/transformers/StampTransformer.js vendored
View File

@ -42,7 +42,7 @@ export default class SculptTransformer extends BaseTransformer {
} }
tap(event) { tap(event) {
const intersection = event.intersections.find(({ object }) => object instanceof ShapeMesh); const intersection = event.intersections.find(({ object }) => object.isShapeMesh);
if (this.hasSelection && intersection) { if (this.hasSelection && intersection) {
this.dispatch(actions.stamp(intersection)); this.dispatch(actions.stamp(intersection));
} else { } else {

1
src/utils/threeUtils.js
View File

@ -41,6 +41,7 @@ export function createTextureFromBlob(blob) {
} }
export class SpriteHandle extends THREE.Sprite { export class SpriteHandle extends THREE.Sprite {
isUIHandle = true;
constructor(texture, scale) { constructor(texture, scale) {
if (!texture.image) { if (!texture.image) {
debug('Error: Texture not loaded'); debug('Error: Texture not loaded');