Browse Source

Merge pull request #16083 from FMS-Cat/webglrenderlists-d-ts

Improve WebGLRenderLists.d.ts
Mr.doob 6 years ago
parent
commit
072cf7b916
1 changed files with 14 additions and 11 deletions
  1. 14 11
      src/renderers/webgl/WebGLRenderLists.d.ts

+ 14 - 11
src/renderers/webgl/WebGLRenderLists.d.ts

@@ -1,5 +1,4 @@
 import { Object3D } from './../../core/Object3D';
 import { Object3D } from './../../core/Object3D';
-import { Geometry } from './../../core/Geometry';
 import { Material } from './../../materials/Material';
 import { Material } from './../../materials/Material';
 import { WebGLProgram } from './WebGLProgram';
 import { WebGLProgram } from './WebGLProgram';
 import { Group } from './../../objects/Group';
 import { Group } from './../../objects/Group';
@@ -12,35 +11,39 @@ export interface RenderTarget {} // not defined in the code, used in LightShadow
 export interface RenderItem {
 export interface RenderItem {
   id: number;
   id: number;
   object: Object3D;
   object: Object3D;
-  geometry: Geometry | BufferGeometry;
+  geometry: BufferGeometry | null;
   material: Material;
   material: Material;
   program: WebGLProgram;
   program: WebGLProgram;
   groupOrder: number;
   groupOrder: number;
   renderOrder: number;
   renderOrder: number;
   z: number;
   z: number;
-  group: Group;
+  group: Group | null;
 }
 }
 
 
 export class WebGLRenderList {
 export class WebGLRenderList {
   opaque: Array<RenderItem>;
   opaque: Array<RenderItem>;
-  transparent: Array<any>;
+  transparent: Array<RenderItem>;
   init(): void;
   init(): void;
   push(
   push(
     object: Object3D,
     object: Object3D,
-    geometry: Geometry | BufferGeometry,
+    geometry: BufferGeometry | null,
     material: Material,
     material: Material,
+    groupOrder: number,
     z: number,
     z: number,
-    group: Group
+    group: Group | null
+  ): void;
+  unshift(
+    object: Object3D,
+    geometry: BufferGeometry | null,
+    material: Material,
+    groupOrder: number,
+    z: number,
+    group: Group | null
   ): void;
   ): void;
-
   sort(): void;
   sort(): void;
 }
 }
 
 
 export class WebGLRenderLists {
 export class WebGLRenderLists {
   dispose(): void;
   dispose(): void;
-  /**
-   *
-   * returns {<String> : <WebGLRenderList>}
-   */
   get(scene: Scene, camera: Camera): WebGLRenderList;
   get(scene: Scene, camera: Camera): WebGLRenderList;
 }
 }