fix(core): make ContentGeometry static. Geometry needs to be statical…

…ly available for the mesh
nartc · Dec 6, 2021 · f7197d1 · f7197d1
1 parent 523573b
commit f7197d1
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 14 deletions.
diff --git a/packages/core/src/lib/controllers/content-geometry.controller.ts b/packages/core/src/lib/controllers/content-geometry.controller.ts
@@ -23,7 +23,7 @@ import { Controller, createControllerProviderFactory } from './controller';
   exportAs: 'ngtContentGeometryController',
 })
 export class NgtContentGeometryController extends Controller {
-  @ContentChild(NgtGeometry)
+  @ContentChild(NgtGeometry, { static: true })
   set geometryDirective(v: NgtGeometry) {
     if (this.geometry == null && v) {
       this.geometry = v.geometry;

diff --git a/packages/core/src/lib/controllers/content-material.controller.ts b/packages/core/src/lib/controllers/content-material.controller.ts
@@ -41,9 +41,11 @@ import { Controller, createControllerProviderFactory } from './controller';
   exportAs: 'ngtContentMaterialController',
 })
 export class NgtContentMaterialController extends Controller {
-  @ContentChildren(NgtMaterial, { descendants: true }) set materialDirectives(
-    v: QueryList<NgtMaterial>
-  ) {
+  @ContentChildren(NgtMaterial, {
+    descendants: true,
+    emitDistinctChangesOnly: true,
+  })
+  set materialDirectives(v: QueryList<NgtMaterial>) {
     if (this.material == null && v) {
       this.material =
         v.length === 1

diff --git a/packages/core/src/lib/controllers/material-geometry.controller.ts b/packages/core/src/lib/controllers/material-geometry.controller.ts
@@ -3,14 +3,13 @@ import {
   AfterContentInit,
   Directive,
   Inject,
+  InjectionToken,
   Input,
   NgModule,
   NgZone,
-  OnInit,
 } from '@angular/core';
 import * as THREE from 'three';
 import { AnyConstructor, AnyExtenderFunction, UnknownRecord } from '../models';
-import { NGT_OBJECT_POST_INIT, NGT_OBJECT_TYPE } from '../tokens';
 import {
   NGT_CONTENT_GEOMETRY_CONTROLLER_PROVIDER,
   NGT_CONTENT_GEOMETRY_WATCHED_CONTROLLER,
@@ -28,6 +27,16 @@ import {
   NgtObject3dController,
 } from './object-3d.controller';
 
+export const NGT_OBJECT_TYPE = new InjectionToken('Object3d Type', {
+  providedIn: 'root',
+  factory: () => THREE.Object3D,
+});
+
+export const NGT_OBJECT_POST_INIT = new InjectionToken('Object3d PostInit', {
+  providedIn: 'root',
+  factory: () => undefined,
+});
+
 @Directive({
   selector: `
     ngt-mesh,
@@ -46,7 +55,7 @@ import {
 })
 export class NgtMaterialGeometryController
   extends Controller
-  implements AfterContentInit, OnInit
+  implements AfterContentInit
 {
   #meshArgs: unknown[] = [];
   set meshArgs(v: unknown | unknown[]) {
@@ -115,7 +124,9 @@ export class NgtMaterialGeometryController
   }
 
   ngAfterContentInit() {
-    this.objectController.init();
+    this.ngZone.runOutsideAngular(() => {
+      this.objectController.init();
+    });
   }
 
   get controller(): Controller | undefined {

diff --git a/tools/generators/three/controllers/files/content-geometry.controller.ts__tmpl__ b/tools/generators/three/controllers/files/content-geometry.controller.ts__tmpl__
@@ -19,7 +19,7 @@ import { Controller, createControllerProviderFactory } from './controller';
   exportAs: 'ngtContentGeometryController',
 })
 export class NgtContentGeometryController extends Controller {
-  @ContentChild(NgtGeometry)
+  @ContentChild(NgtGeometry, { static: true })
   set geometryDirective(v: NgtGeometry) {
     if (this.geometry == null && v) {
       this.geometry = v.geometry;

diff --git a/tools/generators/three/controllers/files/content-material.controller.ts__tmpl__ b/tools/generators/three/controllers/files/content-material.controller.ts__tmpl__
@@ -21,7 +21,10 @@ import { Controller, createControllerProviderFactory } from './controller';
   exportAs: 'ngtContentMaterialController',
 })
 export class NgtContentMaterialController extends Controller {
-  @ContentChildren(NgtMaterial, { descendants: true }) set materialDirectives(
+  @ContentChildren(NgtMaterial, {
+    descendants: true,
+    emitDistinctChangesOnly: true,
+  }) set materialDirectives(
     v: QueryList<NgtMaterial>
   ) {
     if (this.material == null && v) {

diff --git a/tools/generators/three/controllers/files/material-geometry.controller.ts__tmpl__ b/tools/generators/three/controllers/files/material-geometry.controller.ts__tmpl__
@@ -6,11 +6,9 @@ import {
   Input,
   NgModule,
   NgZone,
-  OnInit,
 } from '@angular/core';
 import * as THREE from 'three';
 import { AnyConstructor, AnyExtenderFunction, UnknownRecord } from '../models';
-import { NGT_OBJECT_POST_INIT, NGT_OBJECT_TYPE } from '../tokens';
 import {
   NGT_CONTENT_GEOMETRY_CONTROLLER_PROVIDER,
   NGT_CONTENT_GEOMETRY_WATCHED_CONTROLLER,
@@ -28,6 +26,16 @@ import {
   NgtObject3dController,
 } from './object-3d.controller';
 
+export const NGT_OBJECT_TYPE = new InjectionToken('Object3d Type', {
+  providedIn: 'root',
+  factory: () => THREE.Object3D,
+});
+
+export const NGT_OBJECT_POST_INIT = new InjectionToken('Object3d PostInit', {
+  providedIn: 'root',
+  factory: () => undefined,
+});
+
 @Directive({
   selector: `<% for (const mesh of meshSelectors) { %>
     ngt-<%= mesh %>,<% } %><% for (const line of lineSelectors) { %>
@@ -42,7 +50,7 @@ import {
 })
 export class NgtMaterialGeometryController
   extends Controller
-  implements AfterContentInit, OnInit
+  implements AfterContentInit
 {
   #meshArgs: unknown[] = [];
   set meshArgs(v: unknown | unknown[]) {
@@ -111,7 +119,9 @@ export class NgtMaterialGeometryController
   }
 
   ngAfterContentInit() {
-    this.objectController.init();
+    this.ngZone.runOutsideAngular(() => {
+      this.objectController.init();
+    });
   }
 
   get controller(): Controller | undefined {