fix(core): update controllers generator to reflect manual changes

nartc · Dec 3, 2021 · 0b855ee · 0b855ee
1 parent 53d0187
commit 0b855ee
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 11 deletions.
diff --git a/tools/generators/three/controllers/files/material-geometry.controller.ts__tmpl__ b/tools/generators/three/controllers/files/material-geometry.controller.ts__tmpl__
@@ -11,6 +11,7 @@ import {
 } 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,
@@ -136,13 +137,3 @@ export const [
   watchedControllerTokenName: 'Watched MaterialGeometryController',
   controller: NgtMaterialGeometryController,
 });
-
-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,
-});
diff --git a/tools/generators/three/controllers/files/object-3d.controller.ts__tmpl__ b/tools/generators/three/controllers/files/object-3d.controller.ts__tmpl__
@@ -94,7 +94,7 @@ export class NgtObject3dController extends Controller implements OnDestroy {
     private objectInputsController: NgtObject3dInputsController,
     @Inject(NGT_ANIMATION_SUBSCRIBER_WATCHED_CONTROLLER)
     private animationSubscriberController: NgtAnimationSubscriberController,
-    @Optional() @SkipSelf() private parentObject3d: NgtObject3dController | null
+    @Optional() @SkipSelf() private parentObject3d: NgtObject3dController
   ) {
     super(ngZone);