Forráskód Böngészése

Merge pull request #18848 from Mugen87/dev43

TS: Clean up PointsMaterial.
Mr.doob 5 éve
szülő
commit
d5f63afc82
2 módosított fájl, 17 hozzáadás és 21 törlés
  1. 15 0
      src/Three.Legacy.d.ts
  2. 2 21
      src/materials/PointsMaterial.d.ts

+ 15 - 0
src/Three.Legacy.d.ts

@@ -12,6 +12,21 @@ export namespace SceneUtils {
 	export function attach( child: Object3D, scene: Scene, parent: Object3D ): void;
 }
 
+/**
+ * @deprecated Use an Array instead.
+ */
+export class MultiMaterial extends Material {
+
+	constructor( materials?: Material[] );
+
+	readonly isMultiMaterial: true;
+
+	materials: Material[];
+
+	toJSON( meta: any ): any;
+
+}
+
 /**
  * @deprecated Material.vertexColors is now a boolean.
  */

+ 2 - 21
src/materials/PointsMaterial.d.ts

@@ -2,33 +2,13 @@ import { Material, MaterialParameters } from './Material';
 import { Color } from './../math/Color';
 import { Texture } from './../textures/Texture';
 
-// MultiMaterial does not inherit the Material class in the original code. However, it should treat as Material class.
-// See tests/canvas/canvas_materials.ts.
-/**
- * @deprecated Use an Array instead.
- */
-export class MultiMaterial extends Material {
-
-	constructor( materials?: Material[] );
-
-	readonly isMultiMaterial: true;
-
-	materials: Material[];
-
-	toJSON( meta: any ): any;
-
-}
-
-/**
- * @deprecated Use {@link MultiMaterial} instead.
- */
-
 export interface PointsMaterialParameters extends MaterialParameters {
 	color?: Color | string | number;
 	map?: Texture | null;
 	alphaMap?: Texture | null;
 	size?: number;
 	sizeAttenuation?: boolean;
+	morphTargets?: boolean;
 }
 
 export class PointsMaterial extends Material {
@@ -40,6 +20,7 @@ export class PointsMaterial extends Material {
 	alphaMap: Texture | null;
 	size: number;
 	sizeAttenuation: boolean;
+	morphTargets: boolean;
 
 	setValues( parameters: PointsMaterialParameters ): void;