Skip to content
719 changes: 362 additions & 357 deletions src-testing/changes.patch

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-testing/create-src.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ const files = [
'renderers/common/extras/PMREMGenerator',
'renderers/common/nodes/NodeBuilderState',
'renderers/common/nodes/NodeLibrary',
'renderers/common/nodes/NodeManager',
'renderers/common/nodes/NodeUniform',
'renderers/common/nodes/NodeUniformsGroup',
'renderers/common/nodes/Nodes',
'renderers/common/Animation',
'renderers/common/Attributes',
'renderers/common/Backend',
Expand Down
2 changes: 1 addition & 1 deletion src-testing/declarations.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ const files = [
'nodes/core/StructTypeNode',
'nodes/core/UniformNode',
'renderers/common/nodes/NodeBuilderState',
'renderers/common/nodes/Nodes',
'renderers/common/nodes/NodeLibrary',
'renderers/common/nodes/NodeManager',
'renderers/common/nodes/NodeUniform',
'renderers/common/nodes/NodeUniformsGroup',
'renderers/common/Animation',
Expand Down
6 changes: 3 additions & 3 deletions types/three/src/renderers/common/Animation.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import Info from "./Info.js";
import Nodes from "./nodes/Nodes.js";
import NodeManager from "./nodes/NodeManager.js";
import Renderer from "./Renderer.js";
export interface AnimationContext {
requestAnimationFrame(callback: FrameRequestCallback, xrFrame?: XRFrame): number;
Expand All @@ -12,7 +12,7 @@ export interface AnimationContext {
*/
declare class Animation {
renderer: Renderer;
nodes: Nodes;
nodes: NodeManager;
info: Info;
_context: AnimationContext | null;
_animationLoop: ((time: DOMHighResTimeStamp, xrFrame?: XRFrame) => void) | null;
Expand All @@ -24,7 +24,7 @@ declare class Animation {
* @param {Nodes} nodes - Renderer component for managing nodes related logic.
* @param {Info} info - Renderer component for managing metrics and monitoring data.
*/
constructor(renderer: Renderer, nodes: Nodes, info: Info);
constructor(renderer: Renderer, nodes: NodeManager, info: Info);
/**
* Starts the internal animation loop.
*/
Expand Down
6 changes: 3 additions & 3 deletions types/three/src/renderers/common/Background.d.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { Mesh } from "../../objects/Mesh.js";
import { Scene } from "../../scenes/Scene.js";
import DataMap from "./DataMap.js";
import Nodes from "./nodes/Nodes.js";
import NodeManager from "./nodes/NodeManager.js";
import RenderContext from "./RenderContext.js";
import Renderer from "./Renderer.js";
import RenderList from "./RenderList.js";
Expand All @@ -22,14 +22,14 @@ declare class Background extends DataMap<{
};
}> {
renderer: Renderer;
nodes: Nodes;
nodes: NodeManager;
/**
* Constructs a new background management component.
*
* @param {Renderer} renderer - The renderer.
* @param {Nodes} nodes - Renderer component for managing nodes related logic.
*/
constructor(renderer: Renderer, nodes: Nodes);
constructor(renderer: Renderer, nodes: NodeManager);
/**
* Updates the background for the given scene. Depending on how `Scene.background`
* or `Scene.backgroundNode` are configured, this method might configure a simple clear
Expand Down
6 changes: 3 additions & 3 deletions types/three/src/renderers/common/Bindings.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Backend from "./Backend.js";
import BindGroup from "./BindGroup.js";
import DataMap from "./DataMap.js";
import Info from "./Info.js";
import Nodes from "./nodes/Nodes.js";
import NodeManager from "./nodes/NodeManager.js";
import Pipelines from "./Pipelines.js";
import RenderObject from "./RenderObject.js";
import Textures from "./Textures.js";
Expand Down Expand Up @@ -37,11 +37,11 @@ declare class Bindings extends DataMap<{
textures: Textures;
pipelines: Pipelines;
attributes: Attributes;
nodes: Nodes;
nodes: NodeManager;
info: Info;
constructor(
backend: Backend,
nodes: Nodes,
nodes: NodeManager,
textures: Textures,
attributes: Attributes,
pipelines: Pipelines,
Expand Down
6 changes: 3 additions & 3 deletions types/three/src/renderers/common/Pipelines.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import Binding from "./Binding.js";
import Bindings from "./Bindings.js";
import ComputePipeline from "./ComputePipeline.js";
import DataMap from "./DataMap.js";
import Nodes from "./nodes/Nodes.js";
import NodeManager from "./nodes/NodeManager.js";
import Pipeline from "./Pipeline.js";
import ProgrammableStage from "./ProgrammableStage.js";
import RenderObject from "./RenderObject.js";
Expand Down Expand Up @@ -33,7 +33,7 @@ declare class Pipelines extends DataMap<{
};
}> {
backend: Backend;
nodes: Nodes;
nodes: NodeManager;
bindings: Bindings | null;
caches: Map<string, Pipeline>;
programs: {
Expand All @@ -47,7 +47,7 @@ declare class Pipelines extends DataMap<{
* @param {Backend} backend - The renderer's backend.
* @param {Nodes} nodes - Renderer component for managing nodes related logic.
*/
constructor(backend: Backend, nodes: Nodes);
constructor(backend: Backend, nodes: NodeManager);
/**
* Returns a compute pipeline for the given compute node.
*
Expand Down
6 changes: 3 additions & 3 deletions types/three/src/renderers/common/RenderObject.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import BundleGroup from "./BundleGroup.js";
import ClippingContext from "./ClippingContext.js";
import Geometries from "./Geometries.js";
import NodeBuilderState from "./nodes/NodeBuilderState.js";
import Nodes from "./nodes/Nodes.js";
import NodeManager from "./nodes/NodeManager.js";
import RenderContext from "./RenderContext.js";
import Renderer from "./Renderer.js";
import RenderPipeline from "./RenderPipeline.js";
Expand All @@ -36,7 +36,7 @@ import RenderPipeline from "./RenderPipeline.js";
* @private
*/
declare class RenderObject {
_nodes: Nodes;
_nodes: NodeManager;
_geometries: Geometries;
id: number;
renderer: Renderer;
Expand Down Expand Up @@ -95,7 +95,7 @@ declare class RenderObject {
* @param {ClippingContext} clippingContext - The clipping context.
*/
constructor(
nodes: Nodes,
nodes: NodeManager,
geometries: Geometries,
renderer: Renderer,
object: Object3D,
Expand Down
8 changes: 4 additions & 4 deletions types/three/src/renderers/common/RenderObjects.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import ChainMap from "./ChainMap.js";
import ClippingContext from "./ClippingContext.js";
import Geometries from "./Geometries.js";
import Info from "./Info.js";
import Nodes from "./nodes/Nodes.js";
import NodeManager from "./nodes/NodeManager.js";
import Pipelines from "./Pipelines.js";
import RenderContext from "./RenderContext.js";
import Renderer from "./Renderer.js";
Expand All @@ -20,7 +20,7 @@ import RenderObject from "./RenderObject.js";
*/
declare class RenderObjects {
renderer: Renderer;
nodes: Nodes;
nodes: NodeManager;
geometries: Geometries;
pipelines: Pipelines;
bindings: Bindings;
Expand All @@ -40,7 +40,7 @@ declare class RenderObjects {
*/
constructor(
renderer: Renderer,
nodes: Nodes,
nodes: NodeManager,
geometries: Geometries,
pipelines: Pipelines,
bindings: Bindings,
Expand Down Expand Up @@ -102,7 +102,7 @@ declare class RenderObjects {
* @return {RenderObject} The render object.
*/
createRenderObject(
nodes: Nodes,
nodes: NodeManager,
geometries: Geometries,
renderer: Renderer,
object: Object3D,
Expand Down
4 changes: 2 additions & 2 deletions types/three/src/renderers/common/Renderer.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import Info from "./Info.js";
import InspectorBase from "./InspectorBase.js";
import Lighting from "./Lighting.js";
import NodeLibrary from "./nodes/NodeLibrary.js";
import Nodes from "./nodes/Nodes.js";
import NodeManager from "./nodes/NodeManager.js";
import Pipelines from "./Pipelines.js";
import QuadMesh from "./QuadMesh.js";
import RenderBundle from "./RenderBundle.js";
Expand Down Expand Up @@ -94,7 +94,7 @@ declare class Renderer {
_getFallback: ((error: unknown) => Backend) | null;
_attributes: Attributes | null;
_geometries: Geometries | null;
_nodes: Nodes | null;
_nodes: NodeManager | null;
_animation: Animation | null;
_bindings: Bindings | null;
_objects: RenderObjects | null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,12 +57,6 @@ declare module "../../../scenes/Scene.js" {
* @augments DataMap
*/
declare class Nodes extends DataMap<{
/**
* Constructs a new nodes management component.
*
* @param {Renderer} renderer - The renderer.
* @param {Backend} backend - The renderer's backend.
*/
nodeUniformsGroup: {
key: NodeUniformsGroup;
value: NodeUniformsGroupData;
Expand Down Expand Up @@ -91,6 +85,12 @@ declare class Nodes extends DataMap<{
cacheLib: {
[type: string]: WeakMap<object, Node | undefined>;
};
/**
* Constructs a new nodes management component.
*
* @param {Renderer} renderer - The renderer.
* @param {Backend} backend - The renderer's backend.
*/
constructor(renderer: Renderer, backend: Backend);
/**
* Returns `true` if the given node uniforms group must be updated or not.
Expand Down
Loading