Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
d3be96fb
T
three.js
项目概览
车家大少爷
/
three.js
与 Fork 源项目一致
从无法访问的项目Fork
通知
2
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
three.js
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
d3be96fb
编写于
9月 27, 2019
作者:
O
Olov
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make Textures nullable in Material type definitions. See #17587
上级
ab18028c
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
49 addition
and
49 deletion
+49
-49
src/materials/MeshBasicMaterial.d.ts
src/materials/MeshBasicMaterial.d.ts
+7
-7
src/materials/MeshDepthMaterial.d.ts
src/materials/MeshDepthMaterial.d.ts
+1
-1
src/materials/MeshDistanceMaterial.d.ts
src/materials/MeshDistanceMaterial.d.ts
+1
-1
src/materials/MeshLambertMaterial.d.ts
src/materials/MeshLambertMaterial.d.ts
+7
-7
src/materials/MeshMatcapMaterial.d.ts
src/materials/MeshMatcapMaterial.d.ts
+6
-6
src/materials/MeshNormalMaterial.d.ts
src/materials/MeshNormalMaterial.d.ts
+3
-3
src/materials/MeshPhongMaterial.d.ts
src/materials/MeshPhongMaterial.d.ts
+10
-10
src/materials/MeshPhysicalMaterial.d.ts
src/materials/MeshPhysicalMaterial.d.ts
+1
-1
src/materials/MeshStandardMaterial.d.ts
src/materials/MeshStandardMaterial.d.ts
+11
-11
src/materials/MeshToonMaterial.d.ts
src/materials/MeshToonMaterial.d.ts
+1
-1
src/materials/SpriteMaterial.d.ts
src/materials/SpriteMaterial.d.ts
+1
-1
未找到文件。
src/materials/MeshBasicMaterial.d.ts
浏览文件 @
d3be96fb
...
@@ -8,12 +8,12 @@ import { Combine } from '../constants';
...
@@ -8,12 +8,12 @@ import { Combine } from '../constants';
export
interface
MeshBasicMaterialParameters
extends
MaterialParameters
{
export
interface
MeshBasicMaterialParameters
extends
MaterialParameters
{
color
?:
Color
|
string
|
number
;
color
?:
Color
|
string
|
number
;
opacity
?:
number
;
opacity
?:
number
;
map
?:
Texture
;
map
?:
Texture
|
null
;
aoMap
?:
Texture
;
aoMap
?:
Texture
|
null
;
aoMapIntensity
?:
number
;
aoMapIntensity
?:
number
;
specularMap
?:
Texture
;
specularMap
?:
Texture
|
null
;
alphaMap
?:
Texture
;
alphaMap
?:
Texture
|
null
;
envMap
?:
Texture
;
envMap
?:
Texture
|
null
;
combine
?:
Combine
;
combine
?:
Combine
;
reflectivity
?:
number
;
reflectivity
?:
number
;
refractionRatio
?:
number
;
refractionRatio
?:
number
;
...
@@ -27,7 +27,7 @@ export interface MeshBasicMaterialParameters extends MaterialParameters {
...
@@ -27,7 +27,7 @@ export interface MeshBasicMaterialParameters extends MaterialParameters {
export
class
MeshBasicMaterial
extends
Material
{
export
class
MeshBasicMaterial
extends
Material
{
constructor
(
parameters
?:
MeshBasicMaterialParameters
);
constructor
(
parameters
?:
MeshBasicMaterialParameters
);
color
:
Color
;
color
:
Color
;
map
:
Texture
|
null
;
map
:
Texture
|
null
;
...
@@ -46,6 +46,6 @@ export class MeshBasicMaterial extends Material {
...
@@ -46,6 +46,6 @@ export class MeshBasicMaterial extends Material {
skinning
:
boolean
;
skinning
:
boolean
;
morphTargets
:
boolean
;
morphTargets
:
boolean
;
setValues
(
parameters
:
MeshBasicMaterialParameters
):
void
;
setValues
(
parameters
:
MeshBasicMaterialParameters
):
void
;
}
}
src/materials/MeshDepthMaterial.d.ts
浏览文件 @
d3be96fb
...
@@ -4,7 +4,7 @@ import { Texture } from './../textures/Texture';
...
@@ -4,7 +4,7 @@ import { Texture } from './../textures/Texture';
export
interface
MeshDepthMaterialParameters
extends
MaterialParameters
{
export
interface
MeshDepthMaterialParameters
extends
MaterialParameters
{
depthPacking
?:
DepthPackingStrategies
;
depthPacking
?:
DepthPackingStrategies
;
displacementMap
?:
Texture
;
displacementMap
?:
Texture
|
null
;
displacementScale
?:
number
;
displacementScale
?:
number
;
displacementBias
?:
number
;
displacementBias
?:
number
;
wireframe
?:
boolean
;
wireframe
?:
boolean
;
...
...
src/materials/MeshDistanceMaterial.d.ts
浏览文件 @
d3be96fb
...
@@ -6,7 +6,7 @@ export interface MeshDistanceMaterialParameters extends MaterialParameters {
...
@@ -6,7 +6,7 @@ export interface MeshDistanceMaterialParameters extends MaterialParameters {
referencePosition
?:
Vector3
;
referencePosition
?:
Vector3
;
nearDistance
?:
number
;
nearDistance
?:
number
;
farDistance
?:
number
;
farDistance
?:
number
;
displacementMap
?:
Texture
;
displacementMap
?:
Texture
|
null
;
displacementScale
?:
number
;
displacementScale
?:
number
;
displacementBias
?:
number
;
displacementBias
?:
number
;
}
}
...
...
src/materials/MeshLambertMaterial.d.ts
浏览文件 @
d3be96fb
...
@@ -7,15 +7,15 @@ export interface MeshLambertMaterialParameters extends MaterialParameters {
...
@@ -7,15 +7,15 @@ export interface MeshLambertMaterialParameters extends MaterialParameters {
color
?:
Color
|
string
|
number
;
color
?:
Color
|
string
|
number
;
emissive
?:
Color
|
string
|
number
;
emissive
?:
Color
|
string
|
number
;
emissiveIntensity
?:
number
;
emissiveIntensity
?:
number
;
emissiveMap
?:
Texture
;
emissiveMap
?:
Texture
|
null
;
map
?:
Texture
;
map
?:
Texture
|
null
;
lightMap
?:
Texture
;
lightMap
?:
Texture
|
null
;
lightMapIntensity
?:
number
;
lightMapIntensity
?:
number
;
aoMap
?:
Texture
;
aoMap
?:
Texture
|
null
;
aoMapIntensity
?:
number
;
aoMapIntensity
?:
number
;
specularMap
?:
Texture
;
specularMap
?:
Texture
|
null
;
alphaMap
?:
Texture
;
alphaMap
?:
Texture
|
null
;
envMap
?:
Texture
;
envMap
?:
Texture
|
null
;
combine
?:
Combine
;
combine
?:
Combine
;
reflectivity
?:
number
;
reflectivity
?:
number
;
refractionRatio
?:
number
;
refractionRatio
?:
number
;
...
...
src/materials/MeshMatcapMaterial.d.ts
浏览文件 @
d3be96fb
...
@@ -7,17 +7,17 @@ import { NormalMapTypes } from '../constants';
...
@@ -7,17 +7,17 @@ import { NormalMapTypes } from '../constants';
export
interface
MeshMatcapMaterialParameters
extends
MaterialParameters
{
export
interface
MeshMatcapMaterialParameters
extends
MaterialParameters
{
color
?:
Color
|
string
|
number
;
color
?:
Color
|
string
|
number
;
matcap
?:
Texture
;
matcap
?:
Texture
|
null
;
map
?:
Texture
;
map
?:
Texture
|
null
;
bumpMap
?:
Texture
;
bumpMap
?:
Texture
|
null
;
bumpScale
?:
number
;
bumpScale
?:
number
;
normalMap
?:
Texture
;
normalMap
?:
Texture
|
null
;
normalMapType
?:
NormalMapTypes
;
normalMapType
?:
NormalMapTypes
;
normalScale
?:
Vector2
;
normalScale
?:
Vector2
;
displacementMap
?:
Texture
;
displacementMap
?:
Texture
|
null
;
displacementScale
?:
number
;
displacementScale
?:
number
;
displacementBias
?:
number
;
displacementBias
?:
number
;
alphaMap
?:
Texture
;
alphaMap
?:
Texture
|
null
;
skinning
?:
boolean
;
skinning
?:
boolean
;
morphTargets
?:
boolean
;
morphTargets
?:
boolean
;
morphNormals
?:
boolean
;
morphNormals
?:
boolean
;
...
...
src/materials/MeshNormalMaterial.d.ts
浏览文件 @
d3be96fb
...
@@ -5,12 +5,12 @@ import { NormalMapTypes } from '../constants';
...
@@ -5,12 +5,12 @@ import { NormalMapTypes } from '../constants';
export
interface
MeshNormalMaterialParameters
extends
MaterialParameters
{
export
interface
MeshNormalMaterialParameters
extends
MaterialParameters
{
bumpMap
?:
Texture
;
bumpMap
?:
Texture
|
null
;
bumpScale
?:
number
;
bumpScale
?:
number
;
normalMap
?:
Texture
;
normalMap
?:
Texture
|
null
;
normalMapType
?:
NormalMapTypes
;
normalMapType
?:
NormalMapTypes
;
normalScale
?:
Vector2
;
normalScale
?:
Vector2
;
displacementMap
?:
Texture
;
displacementMap
?:
Texture
|
null
;
displacementScale
?:
number
;
displacementScale
?:
number
;
displacementBias
?:
number
;
displacementBias
?:
number
;
wireframe
?:
boolean
;
wireframe
?:
boolean
;
...
...
src/materials/MeshPhongMaterial.d.ts
浏览文件 @
d3be96fb
...
@@ -10,25 +10,25 @@ export interface MeshPhongMaterialParameters extends MaterialParameters {
...
@@ -10,25 +10,25 @@ export interface MeshPhongMaterialParameters extends MaterialParameters {
specular
?:
Color
|
string
|
number
;
specular
?:
Color
|
string
|
number
;
shininess
?:
number
;
shininess
?:
number
;
opacity
?:
number
;
opacity
?:
number
;
map
?:
Texture
;
map
?:
Texture
|
null
;
lightMap
?:
Texture
;
lightMap
?:
Texture
|
null
;
lightMapIntensity
?:
number
;
lightMapIntensity
?:
number
;
aoMap
?:
Texture
;
aoMap
?:
Texture
|
null
;
aoMapIntensity
?:
number
;
aoMapIntensity
?:
number
;
emissive
?:
Color
|
string
|
number
;
emissive
?:
Color
|
string
|
number
;
emissiveIntensity
?:
number
;
emissiveIntensity
?:
number
;
emissiveMap
?:
Texture
;
emissiveMap
?:
Texture
|
null
;
bumpMap
?:
Texture
;
bumpMap
?:
Texture
|
null
;
bumpScale
?:
number
;
bumpScale
?:
number
;
normalMap
?:
Texture
;
normalMap
?:
Texture
|
null
;
normalMapType
?:
NormalMapTypes
;
normalMapType
?:
NormalMapTypes
;
normalScale
?:
Vector2
;
normalScale
?:
Vector2
;
displacementMap
?:
Texture
;
displacementMap
?:
Texture
|
null
;
displacementScale
?:
number
;
displacementScale
?:
number
;
displacementBias
?:
number
;
displacementBias
?:
number
;
specularMap
?:
Texture
;
specularMap
?:
Texture
|
null
;
alphaMap
?:
Texture
;
alphaMap
?:
Texture
|
null
;
envMap
?:
Texture
;
envMap
?:
Texture
|
null
;
combine
?:
Combine
;
combine
?:
Combine
;
reflectivity
?:
number
;
reflectivity
?:
number
;
refractionRatio
?:
number
;
refractionRatio
?:
number
;
...
...
src/materials/MeshPhysicalMaterial.d.ts
浏览文件 @
d3be96fb
...
@@ -15,7 +15,7 @@ export interface MeshPhysicalMaterialParameters
...
@@ -15,7 +15,7 @@ export interface MeshPhysicalMaterialParameters
sheen
?:
Color
;
sheen
?:
Color
;
clearcoatNormalScale
?:
Vector2
;
clearcoatNormalScale
?:
Vector2
;
clearcoatNormalMap
?:
Texture
;
clearcoatNormalMap
?:
Texture
|
null
;
}
}
export
class
MeshPhysicalMaterial
extends
MeshStandardMaterial
{
export
class
MeshPhysicalMaterial
extends
MeshStandardMaterial
{
...
...
src/materials/MeshStandardMaterial.d.ts
浏览文件 @
d3be96fb
...
@@ -8,26 +8,26 @@ export interface MeshStandardMaterialParameters extends MaterialParameters {
...
@@ -8,26 +8,26 @@ export interface MeshStandardMaterialParameters extends MaterialParameters {
color
?:
Color
|
string
|
number
;
color
?:
Color
|
string
|
number
;
roughness
?:
number
;
roughness
?:
number
;
metalness
?:
number
;
metalness
?:
number
;
map
?:
Texture
;
map
?:
Texture
|
null
;
lightMap
?:
Texture
;
lightMap
?:
Texture
|
null
;
lightMapIntensity
?:
number
;
lightMapIntensity
?:
number
;
aoMap
?:
Texture
;
aoMap
?:
Texture
|
null
;
aoMapIntensity
?:
number
;
aoMapIntensity
?:
number
;
emissive
?:
Color
|
string
|
number
;
emissive
?:
Color
|
string
|
number
;
emissiveIntensity
?:
number
;
emissiveIntensity
?:
number
;
emissiveMap
?:
Texture
;
emissiveMap
?:
Texture
|
null
;
bumpMap
?:
Texture
;
bumpMap
?:
Texture
|
null
;
bumpScale
?:
number
;
bumpScale
?:
number
;
normalMap
?:
Texture
;
normalMap
?:
Texture
|
null
;
normalMapType
?:
NormalMapTypes
;
normalMapType
?:
NormalMapTypes
;
normalScale
?:
Vector2
;
normalScale
?:
Vector2
;
displacementMap
?:
Texture
;
displacementMap
?:
Texture
|
null
;
displacementScale
?:
number
;
displacementScale
?:
number
;
displacementBias
?:
number
;
displacementBias
?:
number
;
roughnessMap
?:
Texture
;
roughnessMap
?:
Texture
|
null
;
metalnessMap
?:
Texture
;
metalnessMap
?:
Texture
|
null
;
alphaMap
?:
Texture
;
alphaMap
?:
Texture
|
null
;
envMap
?:
Texture
;
envMap
?:
Texture
|
null
;
envMapIntensity
?:
number
;
envMapIntensity
?:
number
;
refractionRatio
?:
number
;
refractionRatio
?:
number
;
wireframe
?:
boolean
;
wireframe
?:
boolean
;
...
...
src/materials/MeshToonMaterial.d.ts
浏览文件 @
d3be96fb
...
@@ -2,7 +2,7 @@ import { Texture } from './../textures/Texture';
...
@@ -2,7 +2,7 @@ import { Texture } from './../textures/Texture';
import
{
MeshPhongMaterialParameters
,
MeshPhongMaterial
}
from
'
./MeshPhongMaterial
'
;
import
{
MeshPhongMaterialParameters
,
MeshPhongMaterial
}
from
'
./MeshPhongMaterial
'
;
export
interface
MeshToonMaterialParameters
extends
MeshPhongMaterialParameters
{
export
interface
MeshToonMaterialParameters
extends
MeshPhongMaterialParameters
{
gradientMap
?:
Texture
;
gradientMap
?:
Texture
|
null
;
}
}
export
class
MeshToonMaterial
extends
MeshPhongMaterial
{
export
class
MeshToonMaterial
extends
MeshPhongMaterial
{
...
...
src/materials/SpriteMaterial.d.ts
浏览文件 @
d3be96fb
...
@@ -4,7 +4,7 @@ import { MaterialParameters, Material } from './Material';
...
@@ -4,7 +4,7 @@ import { MaterialParameters, Material } from './Material';
export
interface
SpriteMaterialParameters
extends
MaterialParameters
{
export
interface
SpriteMaterialParameters
extends
MaterialParameters
{
color
?:
Color
|
string
|
number
;
color
?:
Color
|
string
|
number
;
map
?:
Texture
;
map
?:
Texture
|
null
;
rotation
?:
number
;
rotation
?:
number
;
sizeAttenuation
?:
boolean
;
sizeAttenuation
?:
boolean
;
}
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录