Skip to content

Commit 79c68aa

Browse files
committed
fix(core): rename assertInjectionContext to assertInjector
1 parent 89f060f commit 79c68aa

File tree

27 files changed

+54
-74
lines changed

27 files changed

+54
-74
lines changed

Diff for: libs/cannon/services/src/lib/body.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import type {
2525
Triplet,
2626
VectorName,
2727
} from '@pmndrs/cannon-worker-api';
28-
import { assertInjectionContext, injectNgtRef, type NgtAnyRecord, type NgtInjectedRef } from 'angular-three';
28+
import { assertInjector, injectNgtRef, type NgtAnyRecord, type NgtInjectedRef } from 'angular-three';
2929
import { injectNgtcPhysicsApi, type NgtcCannonEvents } from 'angular-three-cannon';
3030
import { injectNgtcDebugApi } from 'angular-three-cannon/debug';
3131
import * as THREE from 'three';
@@ -233,7 +233,7 @@ function injectBody<TBodyProps extends BodyProps, TObject extends THREE.Object3D
233233
argsFn: NgtcArgFn<TBodyProps['args']>,
234234
{ ref, injector, deps = () => ({}) }: NgtcBodyOptions<TObject> = {},
235235
): NgtcBodyReturn<TObject> {
236-
injector = assertInjectionContext(injectBody, injector);
236+
injector = assertInjector(injectBody, injector);
237237
return runInInjectionContext(injector, () => {
238238
const bodyRef = ref || injectNgtRef<TObject>();
239239

Diff for: libs/cannon/services/src/lib/constraints.ts

+2-9
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,7 @@ import type {
55
HingeConstraintOpts,
66
PointToPointConstraintOpts,
77
} from '@pmndrs/cannon-worker-api';
8-
import {
9-
assertInjectionContext,
10-
injectNgtRef,
11-
is,
12-
makeId,
13-
type NgtAnyRecord,
14-
type NgtInjectedRef,
15-
} from 'angular-three';
8+
import { assertInjector, injectNgtRef, is, makeId, type NgtAnyRecord, type NgtInjectedRef } from 'angular-three';
169
import { injectNgtcPhysicsApi } from 'angular-three-cannon';
1710
import * as THREE from 'three';
1811

@@ -103,7 +96,7 @@ function injectConstraint<
10396
opts = () => ({}) as TOptions,
10497
}: NgtcConstraintOptions<TConstraintType, TOptions> = {},
10598
): NgtcConstraintReturn<TConstraintType, A, B> {
106-
injector = assertInjectionContext(injectConstraint, injector);
99+
injector = assertInjector(injectConstraint, injector);
107100
return runInInjectionContext(injector, () => {
108101
const physicsApi = injectNgtcPhysicsApi();
109102
const worker = physicsApi.select('worker');

Diff for: libs/cannon/services/src/lib/contact-material.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { effect, runInInjectionContext, untracked, type Injector } from '@angular/core';
22
import type { ContactMaterialOptions, MaterialOptions } from '@pmndrs/cannon-worker-api';
3-
import { assertInjectionContext, makeId, type NgtAnyRecord } from 'angular-three';
3+
import { assertInjector, makeId, type NgtAnyRecord } from 'angular-three';
44
import { injectNgtcPhysicsApi } from 'angular-three-cannon';
55

66
export function injectContactMaterial(
@@ -12,7 +12,7 @@ export function injectContactMaterial(
1212
injector,
1313
}: { opts: () => ContactMaterialOptions; deps?: () => NgtAnyRecord; injector?: Injector },
1414
): void {
15-
injector = assertInjectionContext(injectContactMaterial, injector);
15+
injector = assertInjector(injectContactMaterial, injector);
1616
return runInInjectionContext(injector, () => {
1717
const physicsApi = injectNgtcPhysicsApi();
1818
const worker = physicsApi.select('worker');

Diff for: libs/cannon/services/src/lib/ray.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { effect, runInInjectionContext, untracked, type Injector } from '@angular/core';
22
import type { RayMode, RayOptions, RayhitEvent } from '@pmndrs/cannon-worker-api';
3-
import { assertInjectionContext, makeId, type NgtAnyRecord } from 'angular-three';
3+
import { assertInjector, makeId, type NgtAnyRecord } from 'angular-three';
44
import { injectNgtcPhysicsApi } from 'angular-three-cannon';
55

66
export type NgtcRayOptions = {
@@ -23,7 +23,7 @@ export function useRaycastAll(opts: NgtcRayOptions) {
2323
}
2424

2525
function injectRay(mode: RayMode, { options, callback, deps = () => ({}), injector }: NgtcRayOptions) {
26-
injector = assertInjectionContext(injectRay, injector);
26+
injector = assertInjector(injectRay, injector);
2727
return runInInjectionContext(injector, () => {
2828
const physicsApi = injectNgtcPhysicsApi();
2929
const [worker, events] = [physicsApi.select('worker'), physicsApi.get('events')];

Diff for: libs/cannon/services/src/lib/raycast-vehicle.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { effect, runInInjectionContext, untracked, type Injector } from '@angular/core';
22
import type { WheelInfoOptions } from '@pmndrs/cannon-worker-api';
3-
import { assertInjectionContext, injectNgtRef, type NgtAnyRecord, type NgtInjectedRef } from 'angular-three';
3+
import { assertInjector, injectNgtRef, type NgtAnyRecord, type NgtInjectedRef } from 'angular-three';
44
import { injectNgtcPhysicsApi } from 'angular-three-cannon';
55
import * as THREE from 'three';
66
import { getUUID, subscribe } from './body';
@@ -39,7 +39,7 @@ export function injectRaycastVehicle<TObject extends THREE.Object3D = THREE.Obje
3939
deps = () => ({}),
4040
}: { ref?: NgtInjectedRef<TObject>; injector?: Injector; deps?: () => NgtAnyRecord } = {},
4141
): NgtcRaycastVehicleReturn<TObject> {
42-
injector = assertInjectionContext(injectRaycastVehicle, injector);
42+
injector = assertInjector(injectRaycastVehicle, injector);
4343
return runInInjectionContext(injector, () => {
4444
const physicsApi = injectNgtcPhysicsApi();
4545
const [worker, subscriptions] = [physicsApi.select('worker'), physicsApi.get('subscriptions')];

Diff for: libs/cannon/services/src/lib/spring.ts

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
import { effect, runInInjectionContext, untracked, type Injector } from '@angular/core';
22
import type { SpringOptns } from '@pmndrs/cannon-worker-api';
3-
import {
4-
assertInjectionContext,
5-
injectNgtRef,
6-
is,
7-
makeId,
8-
type NgtAnyRecord,
9-
type NgtInjectedRef,
10-
} from 'angular-three';
3+
import { assertInjector, injectNgtRef, is, makeId, type NgtAnyRecord, type NgtInjectedRef } from 'angular-three';
114
import { injectNgtcPhysicsApi } from 'angular-three-cannon';
125

136
export type NgtcSpringApi = {
@@ -35,7 +28,7 @@ export function injectSpring<A extends THREE.Object3D, B extends THREE.Object3D>
3528
deps = () => ({}),
3629
}: { injector?: Injector; deps?: () => NgtAnyRecord; opts?: () => SpringOptns } = {},
3730
): NgtcSpringReturn<A, B> {
38-
injector = assertInjectionContext(injectSpring, injector);
31+
injector = assertInjector(injectSpring, injector);
3932
return runInInjectionContext(injector, () => {
4033
const physicsApi = injectNgtcPhysicsApi();
4134
const worker = physicsApi.select('worker');

Diff for: libs/core/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ export * from './lib/store';
1616
export * from './lib/three-types';
1717
export * from './lib/types';
1818
export * from './lib/utils/apply-props';
19-
export * from './lib/utils/assert-injection-context';
19+
export * from './lib/utils/assert-injector';
2020
export { createAttachFunction } from './lib/utils/attach';
2121
export * from './lib/utils/create-injection-token';
2222
export * from './lib/utils/is';

Diff for: libs/core/src/lib/before-render.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { DestroyRef, Injector, inject, runInInjectionContext } from '@angular/core';
22
import { injectNgtStore, type NgtBeforeRenderRecord } from './store';
3-
import { assertInjectionContext } from './utils/assert-injection-context';
3+
import { assertInjector } from './utils/assert-injector';
44

55
export function injectBeforeRender(
66
cb: NgtBeforeRenderRecord['callback'],
77
{ priority = 0, injector }: { priority?: number; injector?: Injector } = {},
88
) {
9-
injector = assertInjectionContext(injectBeforeRender, injector);
9+
injector = assertInjector(injectBeforeRender, injector);
1010
return runInInjectionContext(injector, () => {
1111
const store = injectNgtStore();
1212
const sub = store.get('internal').subscribe(cb, priority, store);

Diff for: libs/core/src/lib/loader.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { ChangeDetectorRef, Injector, effect, inject, runInInjectionContext, signal, type Signal } from '@angular/core';
22
import type { GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
33
import type { NgtAnyRecord } from './types';
4-
import { assertInjectionContext } from './utils/assert-injection-context';
4+
import { assertInjector } from './utils/assert-injector';
55
import { makeObjectGraph, type NgtObjectMap } from './utils/make';
66
import { safeDetectChanges } from './utils/safe-detect-changes';
77

@@ -101,7 +101,7 @@ export function injectNgtLoader<
101101
injector?: Injector;
102102
} = {},
103103
): Signal<NgtLoaderResults<TUrl, NgtBranchingReturn<TReturn, GLTF, GLTF & NgtObjectMap>> | null> {
104-
injector = assertInjectionContext(injectNgtLoader, injector);
104+
injector = assertInjector(injectNgtLoader, injector);
105105
const response = signal<NgtLoaderResults<TUrl, NgtBranchingReturn<TReturn, GLTF, GLTF & NgtObjectMap>> | null>(
106106
null,
107107
);

Diff for: libs/core/src/lib/ref.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
type Signal,
1111
} from '@angular/core';
1212
import { getLocalState, type NgtInstanceNode } from './instance';
13-
import { assertInjectionContext } from './utils/assert-injection-context';
13+
import { assertInjector } from './utils/assert-injector';
1414
import { is } from './utils/is';
1515

1616
export type NgtInjectedRef<TElement> = ElementRef<TElement> & {
@@ -26,7 +26,7 @@ export function injectNgtRef<TElement>(
2626
initial: ElementRef<TElement> | TElement = null!,
2727
injector?: Injector,
2828
): NgtInjectedRef<TElement> {
29-
injector = assertInjectionContext(injectNgtRef);
29+
injector = assertInjector(injectNgtRef);
3030
const ref = is.ref(initial) ? initial : new ElementRef(initial as TElement);
3131
const signalRef = signal(ref.nativeElement);
3232
const readonlySignal = signalRef.asReadonly();

Diff for: libs/core/src/lib/roots.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { injectNgtLoop } from './loop';
66
import { injectNgtStore, type NgtSize, type NgtState } from './store';
77
import type { NgtAnyRecord, NgtEquConfig } from './types';
88
import { applyProps } from './utils/apply-props';
9-
import { assertInjectionContext } from './utils/assert-injection-context';
9+
import { assertInjector } from './utils/assert-injector';
1010
import { is } from './utils/is';
1111
import { makeDefaultCamera, makeDefaultRenderer, makeDpr } from './utils/make';
1212
import type { NgtSignalStore } from './utils/signal-store';
@@ -17,7 +17,7 @@ const shallowLoose = { objects: 'shallow', strict: false } as NgtEquConfig;
1717
export const roots = new Map<HTMLCanvasElement, NgtSignalStore<NgtState>>();
1818

1919
export function injectCanvasRootInitializer(injector?: Injector) {
20-
injector = assertInjectionContext(injectCanvasRootInitializer, injector);
20+
injector = assertInjector(injectCanvasRootInitializer, injector);
2121

2222
return runInInjectionContext(injector, () => {
2323
const injectedStore = injectNgtStore();
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { Injector, assertInInjectionContext, inject } from '@angular/core';
22

3-
export function assertInjectionContext(fn: Function, injector?: Injector): Injector {
3+
export function assertInjector(fn: Function, injector?: Injector): Injector {
44
!injector && assertInInjectionContext(fn);
55
return injector ?? inject(Injector);
66
}

Diff for: libs/soba/cameras/src/cube-camera/cube-camera.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import {
2121
} from '@angular/core';
2222
import {
2323
NgtArgs,
24-
assertInjectionContext,
24+
assertInjector,
2525
extend,
2626
injectBeforeRender,
2727
injectNgtRef,
@@ -55,7 +55,7 @@ export function injectNgtsCubeCamera(
5555
cubeCameraState: () => Partial<NgtsCubeCameraState>,
5656
{ injector }: { injector?: Injector } = {},
5757
) {
58-
injector = assertInjectionContext(injectNgtsCubeCamera, injector);
58+
injector = assertInjector(injectNgtsCubeCamera, injector);
5959
return runInInjectionContext(injector, () => {
6060
const state = computed(() => ({ ...defaultCubeCameraState, ...cubeCameraState() }));
6161
const resolution = computed(() => state().resolution);

Diff for: libs/soba/loaders/src/progress/progress.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import { ChangeDetectorRef, inject, runInInjectionContext, signal, untracked, type Injector } from '@angular/core';
2-
import { assertInjectionContext, safeDetectChanges } from 'angular-three';
2+
import { assertInjector, safeDetectChanges } from 'angular-three';
33
import * as THREE from 'three';
44

55
export function injectNgtsProgress(injector?: Injector) {
6-
injector = assertInjectionContext(injectNgtsProgress, injector);
6+
injector = assertInjector(injectNgtsProgress, injector);
77
return runInInjectionContext(injector, () => {
88
const cdr = inject(ChangeDetectorRef);
99

Diff for: libs/soba/loaders/src/texture-loader/texture-loader.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { effect, runInInjectionContext, type Injector, type Signal } from '@angular/core';
2-
import { assertInjectionContext, injectNgtLoader, injectNgtStore, type NgtLoaderResults } from 'angular-three';
2+
import { assertInjector, injectNgtLoader, injectNgtStore, type NgtLoaderResults } from 'angular-three';
33
import * as THREE from 'three';
44

55
export function injectNgtsTextureLoader<TInput extends string[] | string | Record<string, string>>(
@@ -12,7 +12,7 @@ export function injectNgtsTextureLoader<TInput extends string[] | string | Recor
1212
injector?: Injector;
1313
} = {},
1414
): Signal<NgtLoaderResults<TInput, THREE.Texture> | null> {
15-
injector = assertInjectionContext(injectNgtsTextureLoader, injector);
15+
injector = assertInjector(injectNgtsTextureLoader, injector);
1616
return runInInjectionContext(injector, () => {
1717
const store = injectNgtStore();
1818
const result = injectNgtLoader(() => THREE.TextureLoader, input, { injector });

Diff for: libs/soba/misc/src/animations/animations.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Injector, computed, effect, runInInjectionContext } from '@angular/core';
2-
import { assertInjectionContext, injectBeforeRender, injectNgtRef, type NgtRef } from 'angular-three';
2+
import { assertInjector, injectBeforeRender, injectNgtRef, type NgtRef } from 'angular-three';
33
import * as THREE from 'three';
44

55
export function injectNgtsAnimations(
@@ -10,7 +10,7 @@ export function injectNgtsAnimations(
1010
playFirstClip = true,
1111
}: { ref?: NgtRef<THREE.Object3D>; playFirstClip?: boolean; injector?: Injector } = {},
1212
) {
13-
injector = assertInjectionContext(injectNgtsAnimations, injector);
13+
injector = assertInjector(injectNgtsAnimations, injector);
1414
return runInInjectionContext(injector, () => {
1515
let actualRef = injectNgtRef<THREE.Object3D>();
1616

Diff for: libs/soba/misc/src/depth-buffer/depth-buffer.ts

+2-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,5 @@
11
import { ChangeDetectorRef, computed, effect, inject, runInInjectionContext, type Injector } from '@angular/core';
2-
import {
3-
assertInjectionContext,
4-
injectBeforeRender,
5-
injectNgtRef,
6-
injectNgtStore,
7-
safeDetectChanges,
8-
} from 'angular-three';
2+
import { assertInjector, injectBeforeRender, injectNgtRef, injectNgtStore, safeDetectChanges } from 'angular-three';
93
import * as THREE from 'three';
104
import { injectNgtsFBO } from '../fbo/fbo';
115

@@ -18,7 +12,7 @@ export function injectNgtsDepthBuffer(
1812
paramsFactory: () => Partial<NgtsDepthBufferParams> = () => ({}),
1913
{ injector }: { injector?: Injector } = {},
2014
) {
21-
injector = assertInjectionContext(injectNgtsDepthBuffer, injector);
15+
injector = assertInjector(injectNgtsDepthBuffer, injector);
2216
return runInInjectionContext(injector, () => {
2317
const depthBufferRef = injectNgtRef<THREE.DepthTexture | null>(null);
2418
const store = injectNgtStore();

Diff for: libs/soba/misc/src/fbo/fbo.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import {
77
runInInjectionContext,
88
type Injector,
99
} from '@angular/core';
10-
import { assertInjectionContext, injectNgtRef, injectNgtStore, safeDetectChanges } from 'angular-three';
10+
import { assertInjector, injectNgtRef, injectNgtStore, safeDetectChanges } from 'angular-three';
1111
import * as THREE from 'three';
1212

1313
interface FBOSettings extends THREE.WebGLRenderTargetOptions {
@@ -24,7 +24,7 @@ export interface NgtsFBOParams {
2424
}
2525

2626
export function injectNgtsFBO(fboParams: () => NgtsFBOParams, { injector }: { injector?: Injector } = {}) {
27-
injector = assertInjectionContext(injectNgtsFBO, injector);
27+
injector = assertInjector(injectNgtsFBO, injector);
2828
return runInInjectionContext(injector, () => {
2929
const store = injectNgtStore();
3030
const cdr = inject(ChangeDetectorRef);

Diff for: libs/soba/misc/src/sampler/sampler.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import {
1111
untracked,
1212
} from '@angular/core';
1313
import {
14-
assertInjectionContext,
14+
assertInjector,
1515
checkUpdate,
1616
extend,
1717
injectNgtRef,
@@ -72,7 +72,7 @@ export function injectNgtsSurfaceSampler(
7272
surfaceSamplerState: () => (Partial<Omit<NgtsSurfaceSamplerState, 'mesh'>> & { mesh: NgtRef<THREE.Mesh> }) | null,
7373
{ injector }: { injector?: Injector } = {},
7474
) {
75-
injector = assertInjectionContext(injectNgtsSurfaceSampler, injector);
75+
injector = assertInjector(injectNgtsSurfaceSampler, injector);
7676
return runInInjectionContext(injector, () => {
7777
const state = computed(() => {
7878
const _state = surfaceSamplerState();

Diff for: libs/soba/misc/src/trail-texture/inject-trail-texture.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import { Injector, computed, runInInjectionContext } from '@angular/core';
2-
import { assertInjectionContext, injectBeforeRender, type NgtThreeEvent } from 'angular-three';
2+
import { assertInjector, injectBeforeRender, type NgtThreeEvent } from 'angular-three';
33
import { TrailTexture, type TrailConfig } from './trail-texture';
44

55
export function injectNgtsTrailTexture(
66
trailConfigFn: () => Partial<TrailConfig>,
77
{ injector }: { injector?: Injector } = {},
88
) {
9-
injector = assertInjectionContext(injectNgtsTrailTexture, injector);
9+
injector = assertInjector(injectNgtsTrailTexture, injector);
1010
return runInInjectionContext(injector, () => {
1111
const config = computed(() => trailConfigFn() || {});
1212
const trail = computed(() => new TrailTexture(config()));

Diff for: libs/soba/misc/src/trail/trail.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
import {
1111
NgtPortal,
1212
NgtPortalContent,
13-
assertInjectionContext,
13+
assertInjector,
1414
extend,
1515
injectBeforeRender,
1616
injectNgtRef,
@@ -57,7 +57,7 @@ export function injectNgtsTrail(
5757
settingsFactory: () => Partial<NgtsTrailSettings>,
5858
{ injector }: { injector?: Injector } = {},
5959
) {
60-
injector = assertInjectionContext(injectNgtsTrail, injector);
60+
injector = assertInjector(injectNgtsTrail, injector);
6161
return runInInjectionContext(injector, () => {
6262
const points = injectNgtRef<Float32Array>();
6363
let frameCount = 0;

Diff for: libs/soba/shaders/src/wireframe-material/wireframe-material.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { computed, effect, runInInjectionContext, type Injector } from '@angular/core';
2-
import { assertInjectionContext, type NgtShaderMaterial } from 'angular-three';
2+
import { assertInjector, type NgtShaderMaterial } from 'angular-three';
33
import * as THREE from 'three';
44
import { shaderMaterial } from '../shader-material/shader-material';
55

@@ -232,7 +232,7 @@ export function injectNgtsWireframeUniforms(
232232
stateFactory: () => Partial<WireframeMaterialState>,
233233
{ injector }: { injector?: Injector } = {},
234234
) {
235-
injector = assertInjectionContext(injectNgtsWireframeUniforms, injector);
235+
injector = assertInjector(injectNgtsWireframeUniforms, injector);
236236
return runInInjectionContext(injector, () => {
237237
const uniforms = uniformsFactory();
238238
const state = computed(() => stateFactory());

Diff for: libs/soba/staging/src/bb-anchor/bb-anchor.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,16 @@ export class NgtsBBAnchor {
6464

6565
private beforeRender() {
6666
injectBeforeRender(() => {
67-
const [parent, group, anchor] = [this.parentRef.nativeElement, this.groupRef.nativeElement, this.xyz()];
67+
const [parent, group, [x, y, z]] = [this.parentRef.nativeElement, this.groupRef.nativeElement, this.xyz()];
6868

6969
if (parent) {
7070
boundingBox.setFromObject(parent);
7171
boundingBox.getSize(boundingBoxSize);
7272

7373
group.position.set(
74-
parent.position.x + (boundingBoxSize.x * anchor[0]) / 2,
75-
parent.position.y + (boundingBoxSize.y * anchor[1]) / 2,
76-
parent.position.z + (boundingBoxSize.z * anchor[2]) / 2,
74+
parent.position.x + (boundingBoxSize.x * x) / 2,
75+
parent.position.y + (boundingBoxSize.y * y) / 2,
76+
parent.position.z + (boundingBoxSize.z * z) / 2,
7777
);
7878
}
7979
});

0 commit comments

Comments
 (0)