fix(soba): delegate all animateReady for sobaExtender

nartc · Jan 8, 2022 · 042ba31 · 042ba31
1 parent 992f35f
commit 042ba31
Showing 30 changed files with 47 additions and 6 deletions.
diff --git a/packages/soba/abstractions/src/billboard/billboard.component.ts b/packages/soba/abstractions/src/billboard/billboard.component.ts
@@ -54,7 +54,7 @@ export class NgtSobaBillboard extends NgtSobaExtender<THREE.Group> {
   onGroupAnimate(group: THREE.Group, $event: NgtRender) {
     if (!this.follow) return;
 
-    this.animateReady.emit($event);
+    this.animateReady.emit({ entity: group, state: $event });
 
     // save previous rotation in case we're locking an axis
     const prevRotation = group.rotation.clone();

diff --git a/packages/soba/abstractions/src/gizmo-helper/gizmo-helper.component.ts b/packages/soba/abstractions/src/gizmo-helper/gizmo-helper.component.ts
@@ -24,6 +24,7 @@ import { NgtSobaGizmoHelperStore } from './gizmo-helper.store';
       <ngt-group
         *ngIf="gizmoProps$ | async as gizmoProps"
         (ready)="onGizmoReady($event)"
+        (animateReady)="animateReady.emit({ entity: object, state: $event })"
         [appendTo]="virtualScene"
         [position]="[gizmoProps.x, gizmoProps.y, 0]"
         [object3dInputsController]="gizmoProps.objectInputsController"

diff --git a/packages/soba/abstractions/src/gizmo-helper/gizmo-viewcube.component.ts b/packages/soba/abstractions/src/gizmo-helper/gizmo-viewcube.component.ts
@@ -182,6 +182,7 @@ export const [
       [appendTo]="gizmo"
       [scale]="[60, 60, 60]"
       (ready)="object = $event"
+      (animateReady)="animateReady.emit({ entity: object, state: $event })"
     >
       <ngt-soba-gizmo-facecube
         [genericController]="genericController"
@@ -246,6 +247,10 @@ export class NgtSobaGizmoViewcube extends NgtSobaExtender<THREE.Group> {
         (pointerover)="$event.stopPropagation(); hover = true"
         (pointerout)="$event.stopPropagation(); hover = false"
         (click)="onEdgeClick($event)"
+        (ready)="object = $event"
+        (animateReady)="
+          animateReady.emit({ entity: object, state: $any($event).state })
+        "
       >
         <ngt-mesh-basic-material
           [parameters]="{
@@ -323,6 +328,9 @@ export class NgtSobaGizmoEdgecube extends NgtSobaExtender<THREE.Mesh> {
       [isMaterialArray]="true"
       [raycast]="raycast$ | async"
       (ready)="object = $event"
+      (animateReady)="
+        animateReady.emit({ entity: object, state: $any($event).state })
+      "
       (click)="onFaceClick($event)"
       (pointermove)="onFacePointerMove($event)"
       (pointerout)="onFacePointerOut($event)"

diff --git a/packages/soba/abstractions/src/gizmo-helper/gizmo-viewport.component.ts b/packages/soba/abstractions/src/gizmo-helper/gizmo-viewport.component.ts
@@ -41,6 +41,7 @@ import { NgtSobaGizmoHelperStore } from './gizmo-helper.store';
     <ngt-group
       *ngIf="gizmo$ | async as gizmo"
       (ready)="object = $event; object.scale.set(40, 40, 40)"
+      (animateReady)="animateReady.emit({ entity: object, state: $event })"
       [appendTo]="gizmo"
       [object3dInputsController]="objectInputsController"
     >
@@ -168,7 +169,11 @@ export class NgtSobaGizmoViewport extends NgtSobaExtender<THREE.Group> {
 @Component({
   selector: 'ngt-soba-gizmo-axis[color][rotation]',
   template: `
-    <ngt-group (ready)="object = $event" [rotation]="rotation">
+    <ngt-group
+      (ready)="object = $event"
+      (animateReady)="animateReady.emit({ entity: object, state: $event })"
+      [rotation]="rotation"
+    >
       <ngt-soba-box [args]="scale" [position]="[0.4, 0, 0]">
         <ngt-mesh-basic-material
           [parameters]="{ color, toneMapped: false }"
@@ -209,6 +214,7 @@ export class NgtSobaGizmoAxis extends NgtSobaExtender<THREE.Group> {
       ></ngt-sprite-material>
       <ngt-sprite
         (ready)="object = $event"
+        (animateReady)="animateReady.emit({ entity: object, state: $event })"
         (pointerover)="onAxisHeadPointerOver($event)"
         (pointerout)="onAxisHeadPointerOut($event)"
         (pointerdown)="onAxisHeadPointerDown($event)"

diff --git a/packages/soba/abstractions/src/image/image.component.ts b/packages/soba/abstractions/src/image/image.component.ts
@@ -108,6 +108,7 @@ export class NgtSobaImageShaderMaterial extends NgtMaterial<
         [scale]="scale"
         [object3dInputsController]="objectInputsController"
         (ready)="object = $event"
+        (animateReady)="animateReady.emit({ entity: object, state: $event })"
       >
         <ngt-plane-geometry
           [args]="[1, 1, segments, segments]"

diff --git a/packages/soba/abstractions/src/positional-audio/positional-audio.component.ts b/packages/soba/abstractions/src/positional-audio/positional-audio.component.ts
@@ -43,6 +43,7 @@ export interface NgtSobaPositionalAudioState {
     <ngt-positional-audio
       *ngIf="listener$ | async as listener"
       (ready)="onPositionalAudioReady($event)"
+      (animateReady)="animateReady.emit({ entity: object, state: $event })"
       [listener]="listener"
       [audioController]="audioController"
     ></ngt-positional-audio>

diff --git a/packages/soba/abstractions/src/text/text.component.ts b/packages/soba/abstractions/src/text/text.component.ts
@@ -41,6 +41,7 @@ import { Text as TextMeshImpl } from 'troika-three-text';
         [object]="$any(object)"
         [object3dInputsController]="objectInputsController"
         (ready)="onTroikaTextReady(object)"
+        (animateReady)="animateReady.emit({ entity: object, state: $event })"
       >
       </ngt-primitive>
     </ng-container>

diff --git a/packages/soba/cameras/src/orthographic-camera/orthographic-camera.component.ts b/packages/soba/cameras/src/orthographic-camera/orthographic-camera.component.ts
@@ -36,6 +36,7 @@ export interface NgtSobaOrthographicCameraState {
       [args]="[vm.left, vm.right, vm.top, vm.bottom, vm.near, vm.far]"
       [object3dInputsController]="vm.objectInputsController"
       (ready)="object = $event"
+      (animateReady)="animateReady.emit({ entity: object, state: $event })"
     >
       <ng-content></ng-content>
     </ngt-orthographic-camera>

diff --git a/packages/soba/performances/src/detailed/detailed.component.ts b/packages/soba/performances/src/detailed/detailed.component.ts
@@ -109,8 +109,9 @@ export class NgtSobaDetailed
     this.state.connect('children', children$);
   }
 
-  onLodAnimateReady({ camera }: NgtRender, lod: THREE.LOD) {
-    lod.update(camera);
+  onLodAnimateReady(state: NgtRender, lod: THREE.LOD) {
+    lod.update(state.camera);
+    this.animateReady.emit({ entity: lod, state });
   }
 
   onLodReady(lod: THREE.LOD) {

diff --git a/packages/soba/shapes/src/lib/box/box.component.ts b/packages/soba/shapes/src/lib/box/box.component.ts
@@ -27,6 +27,7 @@ import * as THREE from 'three';
   template: `
     <ngt-mesh
       (ready)="object = $event"
+      (animateReady)="animateReady.emit({ entity: object, state: $event })"
       [object3dInputsController]="objectInputsController"
       [contentMaterialController]="contentMaterialController"
     >

diff --git a/packages/soba/shapes/src/lib/circle/circle.component.ts b/packages/soba/shapes/src/lib/circle/circle.component.ts
@@ -27,6 +27,7 @@ import * as THREE from 'three';
   template: `
     <ngt-mesh
       (ready)="object = $event"
+      (animateReady)="animateReady.emit({ entity: object, state: $event })"
       [object3dInputsController]="objectInputsController"
       [contentMaterialController]="contentMaterialController"
     >

diff --git a/packages/soba/shapes/src/lib/cone/cone.component.ts b/packages/soba/shapes/src/lib/cone/cone.component.ts
@@ -27,6 +27,7 @@ import * as THREE from 'three';
   template: `
     <ngt-mesh
       (ready)="object = $event"
+      (animateReady)="animateReady.emit({ entity: object, state: $event })"
       [object3dInputsController]="objectInputsController"
       [contentMaterialController]="contentMaterialController"
     >

diff --git a/packages/soba/shapes/src/lib/cylinder/cylinder.component.ts b/packages/soba/shapes/src/lib/cylinder/cylinder.component.ts
@@ -27,6 +27,7 @@ import * as THREE from 'three';
   template: `
     <ngt-mesh
       (ready)="object = $event"
+      (animateReady)="animateReady.emit({ entity: object, state: $event })"
       [object3dInputsController]="objectInputsController"
       [contentMaterialController]="contentMaterialController"
     >

diff --git a/packages/soba/shapes/src/lib/dodecahedron/dodecahedron.component.ts b/packages/soba/shapes/src/lib/dodecahedron/dodecahedron.component.ts
@@ -27,6 +27,7 @@ import * as THREE from 'three';
   template: `
     <ngt-mesh
       (ready)="object = $event"
+      (animateReady)="animateReady.emit({ entity: object, state: $event })"
       [object3dInputsController]="objectInputsController"
       [contentMaterialController]="contentMaterialController"
     >

diff --git a/packages/soba/shapes/src/lib/extrude/extrude.component.ts b/packages/soba/shapes/src/lib/extrude/extrude.component.ts
@@ -27,6 +27,7 @@ import * as THREE from 'three';
   template: `
     <ngt-mesh
       (ready)="object = $event"
+      (animateReady)="animateReady.emit({ entity: object, state: $event })"
       [object3dInputsController]="objectInputsController"
       [contentMaterialController]="contentMaterialController"
     >

diff --git a/packages/soba/shapes/src/lib/icosahedron/icosahedron.component.ts b/packages/soba/shapes/src/lib/icosahedron/icosahedron.component.ts
@@ -27,6 +27,7 @@ import * as THREE from 'three';
   template: `
     <ngt-mesh
       (ready)="object = $event"
+      (animateReady)="animateReady.emit({ entity: object, state: $event })"
       [object3dInputsController]="objectInputsController"
       [contentMaterialController]="contentMaterialController"
     >

diff --git a/packages/soba/shapes/src/lib/lathe/lathe.component.ts b/packages/soba/shapes/src/lib/lathe/lathe.component.ts
@@ -27,6 +27,7 @@ import * as THREE from 'three';
   template: `
     <ngt-mesh
       (ready)="object = $event"
+      (animateReady)="animateReady.emit({ entity: object, state: $event })"
       [object3dInputsController]="objectInputsController"
       [contentMaterialController]="contentMaterialController"
     >

diff --git a/packages/soba/shapes/src/lib/octahedron/octahedron.component.ts b/packages/soba/shapes/src/lib/octahedron/octahedron.component.ts
@@ -27,6 +27,7 @@ import * as THREE from 'three';
   template: `
     <ngt-mesh
       (ready)="object = $event"
+      (animateReady)="animateReady.emit({ entity: object, state: $event })"
       [object3dInputsController]="objectInputsController"
       [contentMaterialController]="contentMaterialController"
     >

diff --git a/packages/soba/shapes/src/lib/plane/plane.component.ts b/packages/soba/shapes/src/lib/plane/plane.component.ts
@@ -27,6 +27,7 @@ import * as THREE from 'three';
   template: `
     <ngt-mesh
       (ready)="object = $event"
+      (animateReady)="animateReady.emit({ entity: object, state: $event })"
       [object3dInputsController]="objectInputsController"
       [contentMaterialController]="contentMaterialController"
     >

diff --git a/packages/soba/shapes/src/lib/polyhedron/polyhedron.component.ts b/packages/soba/shapes/src/lib/polyhedron/polyhedron.component.ts
@@ -27,6 +27,7 @@ import * as THREE from 'three';
   template: `
     <ngt-mesh
       (ready)="object = $event"
+      (animateReady)="animateReady.emit({ entity: object, state: $event })"
       [object3dInputsController]="objectInputsController"
       [contentMaterialController]="contentMaterialController"
     >

diff --git a/packages/soba/shapes/src/lib/ring/ring.component.ts b/packages/soba/shapes/src/lib/ring/ring.component.ts
@@ -27,6 +27,7 @@ import * as THREE from 'three';
   template: `
     <ngt-mesh
       (ready)="object = $event"
+      (animateReady)="animateReady.emit({ entity: object, state: $event })"
       [object3dInputsController]="objectInputsController"
       [contentMaterialController]="contentMaterialController"
     >

diff --git a/packages/soba/shapes/src/lib/sphere/sphere.component.ts b/packages/soba/shapes/src/lib/sphere/sphere.component.ts
@@ -27,6 +27,7 @@ import * as THREE from 'three';
   template: `
     <ngt-mesh
       (ready)="object = $event"
+      (animateReady)="animateReady.emit({ entity: object, state: $event })"
       [object3dInputsController]="objectInputsController"
       [contentMaterialController]="contentMaterialController"
     >

diff --git a/packages/soba/shapes/src/lib/tetrahedron/tetrahedron.component.ts b/packages/soba/shapes/src/lib/tetrahedron/tetrahedron.component.ts
@@ -27,6 +27,7 @@ import * as THREE from 'three';
   template: `
     <ngt-mesh
       (ready)="object = $event"
+      (animateReady)="animateReady.emit({ entity: object, state: $event })"
       [object3dInputsController]="objectInputsController"
       [contentMaterialController]="contentMaterialController"
     >

diff --git a/packages/soba/shapes/src/lib/torus-knot/torus-knot.component.ts b/packages/soba/shapes/src/lib/torus-knot/torus-knot.component.ts
@@ -27,6 +27,7 @@ import * as THREE from 'three';
   template: `
     <ngt-mesh
       (ready)="object = $event"
+      (animateReady)="animateReady.emit({ entity: object, state: $event })"
       [object3dInputsController]="objectInputsController"
       [contentMaterialController]="contentMaterialController"
     >

diff --git a/packages/soba/shapes/src/lib/torus/torus.component.ts b/packages/soba/shapes/src/lib/torus/torus.component.ts
@@ -27,6 +27,7 @@ import * as THREE from 'three';
   template: `
     <ngt-mesh
       (ready)="object = $event"
+      (animateReady)="animateReady.emit({ entity: object, state: $event })"
       [object3dInputsController]="objectInputsController"
       [contentMaterialController]="contentMaterialController"
     >

diff --git a/packages/soba/shapes/src/lib/tube/tube.component.ts b/packages/soba/shapes/src/lib/tube/tube.component.ts
@@ -27,6 +27,7 @@ import * as THREE from 'three';
   template: `
     <ngt-mesh
       (ready)="object = $event"
+      (animateReady)="animateReady.emit({ entity: object, state: $event })"
       [object3dInputsController]="objectInputsController"
       [contentMaterialController]="contentMaterialController"
     >

diff --git a/packages/soba/staging/src/bounds/bounds.component.ts b/packages/soba/staging/src/bounds/bounds.component.ts
@@ -317,6 +317,7 @@ export class NgtSobaBoundsStore extends EnhancedRxState<
   template: `
     <ngt-group
       (ready)="object = $event; sobaSoundsStore.set({ group: $event })"
+      (animateReady)="animateReady.emit({ entity: object, state: $event })"
       [object3dInputsController]="objectInputsController"
     >
       <ng-content></ng-content>

diff --git a/packages/soba/staging/src/center/center.component.ts b/packages/soba/staging/src/center/center.component.ts
@@ -25,6 +25,7 @@ import * as THREE from 'three';
   template: `
     <ngt-group
       (ready)="object = $event"
+      (animateReady)="animateReady.emit({ entity: object, state: $event })"
       [object3dInputsController]="objectInputsController"
     >
       <ngt-group name="outer-soba-center-group">

diff --git a/packages/soba/staging/src/stars/stars.component.ts b/packages/soba/staging/src/stars/stars.component.ts
@@ -154,9 +154,10 @@ export class NgtSobaStars extends NgtSobaExtender<THREE.Points> {
     });
   }
 
-  onAnimate({ clock }: NgtRender) {
+  onAnimate(state: NgtRender) {
     if (this.starMaterial) {
-      this.starMaterial.uniforms.time.value = clock.getElapsedTime();
+      this.starMaterial.uniforms.time.value = state.clock.getElapsedTime();
+      this.animateReady.emit({ entity: this.object, state });
     }
   }
 }

diff --git a/tools/generators/three/soba-shapes/files/lib/__shapeFileName__.component.ts__tmpl__ b/tools/generators/three/soba-shapes/files/lib/__shapeFileName__.component.ts__tmpl__
@@ -27,6 +27,7 @@ import * as THREE from 'three';
   template: `
     <ngt-mesh
       (ready)="object = $event"
+      (animateReady)="animateReady.emit({ entity: object, state: $event })"
       [object3dInputsController]="objectInputsController"
       [contentMaterialController]="contentMaterialController"
     >