diff --git a/package.json b/package.json index 83a362d..8169a79 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "pronature-platform", - "version": "0.8.0", + "version": "0.9.0", "type": "module", "scripts": { "dev": "vite", diff --git a/src/components/GameDesigner/GameDesigner.vue b/src/components/GameDesigner/GameDesigner.vue index 77584cf..8d6dd0e 100644 --- a/src/components/GameDesigner/GameDesigner.vue +++ b/src/components/GameDesigner/GameDesigner.vue @@ -213,7 +213,6 @@ export default { }, selectObject(oid){ - console.log('Selecting object', oid) this.currentObject = this.flatObjects[oid]?.value; this.selectedObject = [oid]; engine.transformControls.attach(this.currentObject.__o); @@ -226,7 +225,7 @@ export default { targetClick(e){ if (performance.now() - this.pointerDownTime < 200){ - let intersects = engine.intersect(e, this.$refs.target, engine.activeObjects.children, true); + let intersects = engine.intersect(e, this.$refs.target, this.flatObjects.map(o=>o.value.__o), true); if (intersects.length){ this.selectObject(intersects[0].object.__pn_id) }else{ diff --git a/src/components/InteractiveObjects/GenericObject/GenericObject.js b/src/components/InteractiveObjects/GenericObject/GenericObject.js index 49720e0..add07c5 100644 --- a/src/components/InteractiveObjects/GenericObject/GenericObject.js +++ b/src/components/InteractiveObjects/GenericObject/GenericObject.js @@ -8,6 +8,15 @@ class GenericObject extends EventManager{ this.source = await engine.load(data.$go.asset.name); this.object = engine.meshUtils.bottomOrigin(this.source.scene) + if (data.asIndividuals){ + this.object.hasIndividualChildren = true; + this.source.scene.traverse(o=>{ + if (o.isMesh){ + o.isIndividual = true; + } + }) + } + if (!data.exclude){ engine.clickable.add(this.object, async e=>{ this.object.__onhud = !this.object.__onhud; diff --git a/src/components/InteractiveObjects/GenericObject/GenericObject.vue b/src/components/InteractiveObjects/GenericObject/GenericObject.vue index bfe8ffd..6c2a5a6 100644 --- a/src/components/InteractiveObjects/GenericObject/GenericObject.vue +++ b/src/components/InteractiveObjects/GenericObject/GenericObject.vue @@ -8,6 +8,8 @@ + + diff --git a/src/pages/manage/game-objects/[[id]].vue b/src/pages/manage/game-objects/[[id]].vue index 3a1fd68..6ab2e26 100644 --- a/src/pages/manage/game-objects/[[id]].vue +++ b/src/pages/manage/game-objects/[[id]].vue @@ -16,7 +16,6 @@ - +
{{ object.asset.name }} | {{ object.asset.ofn }}