Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
a8499173
T
three.js
项目概览
Ablesons
/
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,发现更多精彩内容 >>
提交
a8499173
编写于
8月 18, 2015
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Updated builds.
上级
c3deec78
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
6 addition
and
6 deletion
+6
-6
build/three.js
build/three.js
+2
-2
build/three.min.js
build/three.min.js
+4
-4
未找到文件。
build/three.js
浏览文件 @
a8499173
...
...
@@ -14061,6 +14061,7 @@ THREE.MaterialLoader.prototype = {
if ( json.transparent !== undefined ) material.transparent = json.transparent;
if ( json.alphaTest !== undefined ) material.alphaTest = json.alphaTest;
if ( json.wireframe !== undefined ) material.wireframe = json.wireframe;
if ( json.wireframeLinewidth !== undefined ) material.wireframeLinewidth = json.wireframeLinewidth;
// for PointCloudMaterial
if ( json.size !== undefined ) material.size = json.size;
...
...
@@ -15163,6 +15164,7 @@ THREE.Material.prototype = {
if ( this.transparent === true ) data.transparent = this.transparent;
if ( this.alphaTest > 0 ) data.alphaTest = this.alphaTest;
if ( this.wireframe === true ) data.wireframe = this.wireframe;
if ( this.wireframeLinewidth > 1 ) data.wireframeLinewidth = this.wireframeLinewidth;
return data;
...
...
@@ -34263,8 +34265,6 @@ THREE.WireframeBufferGeometry = function ( geometry ) {
var b = i + 1;
var c = i + 2;
// TODO: Check for duplicates
indices.push( a, b, b, c, c, a );
}
...
...
build/three.min.js
浏览文件 @
a8499173
...
...
@@ -308,7 +308,7 @@ THREE.BufferGeometryLoader.prototype={constructor:THREE.BufferGeometryLoader,loa
c
)
for
(
d
=
0
,
e
=
c
.
length
;
d
!==
e
;
++
d
)
g
=
c
[
d
],
b
.
addDrawcall
(
g
.
start
,
g
.
count
);
a
=
a
.
data
.
boundingSphere
;
void
0
!==
a
&&
(
c
=
new
THREE
.
Vector3
,
void
0
!==
a
.
center
&&
c
.
fromArray
(
a
.
center
),
b
.
boundingSphere
=
new
THREE
.
Sphere
(
c
,
a
.
radius
));
return
b
}};
THREE
.
MaterialLoader
=
function
(
a
){
this
.
manager
=
void
0
!==
a
?
a
:
THREE
.
DefaultLoadingManager
};
THREE
.
MaterialLoader
.
prototype
=
{
constructor
:
THREE
.
MaterialLoader
,
load
:
function
(
a
,
b
,
c
,
d
){
var
e
=
this
,
g
=
new
THREE
.
XHRLoader
(
e
.
manager
);
g
.
setCrossOrigin
(
this
.
crossOrigin
);
g
.
load
(
a
,
function
(
a
){
b
(
e
.
parse
(
JSON
.
parse
(
a
)))},
c
,
d
)},
setCrossOrigin
:
function
(
a
){
this
.
crossOrigin
=
a
},
parse
:
function
(
a
){
var
b
=
new
THREE
[
a
.
type
];
void
0
!==
a
.
color
&&
b
.
color
.
setHex
(
a
.
color
);
void
0
!==
a
.
emissive
&&
b
.
emissive
.
setHex
(
a
.
emissive
);
void
0
!==
a
.
specular
&&
b
.
specular
.
setHex
(
a
.
specular
);
void
0
!==
a
.
shininess
&&
(
b
.
shininess
=
a
.
shininess
);
void
0
!==
a
.
uniforms
&&
(
b
.
uniforms
=
a
.
uniforms
);
void
0
!==
a
.
attributes
&&
(
b
.
attributes
=
a
.
attributes
);
void
0
!==
a
.
vertexShader
&&
(
b
.
vertexShader
=
a
.
vertexShader
);
void
0
!==
a
.
fragmentShader
&&
(
b
.
fragmentShader
=
a
.
fragmentShader
);
void
0
!==
a
.
vertexColors
&&
(
b
.
vertexColors
=
a
.
vertexColors
);
void
0
!==
a
.
shading
&&
(
b
.
shading
=
a
.
shading
);
void
0
!==
a
.
blending
&&
(
b
.
blending
=
a
.
blending
);
void
0
!==
a
.
side
&&
(
b
.
side
=
a
.
side
);
void
0
!==
a
.
opacity
&&
(
b
.
opacity
=
a
.
opacity
);
void
0
!==
a
.
transparent
&&
(
b
.
transparent
=
a
.
transparent
);
void
0
!==
a
.
alphaTest
&&
(
b
.
alphaTest
=
a
.
alphaTest
);
void
0
!==
a
.
wireframe
&&
(
b
.
wireframe
=
a
.
wireframe
);
void
0
!==
a
.
size
&&
(
b
.
size
=
a
.
size
);
void
0
!==
a
.
sizeAttenuation
&&
(
b
.
sizeAttenuation
=
a
.
sizeAttenuation
);
if
(
void
0
!==
a
.
materials
)
for
(
var
c
=
0
,
d
=
a
.
materials
.
length
;
c
<
d
;
c
++
)
b
.
materials
.
push
(
this
.
parse
(
a
.
materials
[
c
]));
return
b
}};
THREE
.
ObjectLoader
=
function
(
a
){
this
.
manager
=
void
0
!==
a
?
a
:
THREE
.
DefaultLoadingManager
;
this
.
texturePath
=
""
};
(
b
.
alphaTest
=
a
.
alphaTest
);
void
0
!==
a
.
wireframe
&&
(
b
.
wireframe
=
a
.
wireframe
);
void
0
!==
a
.
wireframeLinewidth
&&
(
b
.
wireframeLinewidth
=
a
.
wireframeLinewidth
);
void
0
!==
a
.
size
&&
(
b
.
size
=
a
.
size
);
void
0
!==
a
.
sizeAttenuation
&&
(
b
.
sizeAttenuation
=
a
.
sizeAttenuation
);
if
(
void
0
!==
a
.
materials
)
for
(
var
c
=
0
,
d
=
a
.
materials
.
length
;
c
<
d
;
c
++
)
b
.
materials
.
push
(
this
.
parse
(
a
.
materials
[
c
]));
return
b
}};
THREE
.
ObjectLoader
=
function
(
a
){
this
.
manager
=
void
0
!==
a
?
a
:
THREE
.
DefaultLoadingManager
;
this
.
texturePath
=
""
};
THREE
.
ObjectLoader
.
prototype
=
{
constructor
:
THREE
.
ObjectLoader
,
load
:
function
(
a
,
b
,
c
,
d
){
""
===
this
.
texturePath
&&
(
this
.
texturePath
=
a
.
substring
(
0
,
a
.
lastIndexOf
(
"
/
"
)
+
1
));
var
e
=
this
,
g
=
new
THREE
.
XHRLoader
(
e
.
manager
);
g
.
setCrossOrigin
(
this
.
crossOrigin
);
g
.
load
(
a
,
function
(
a
){
e
.
parse
(
JSON
.
parse
(
a
),
b
)},
c
,
d
)},
setTexturePath
:
function
(
a
){
this
.
texturePath
=
a
},
setCrossOrigin
:
function
(
a
){
this
.
crossOrigin
=
a
},
parse
:
function
(
a
,
b
){
var
c
=
this
.
parseGeometries
(
a
.
geometries
),
d
=
this
.
parseImages
(
a
.
images
,
function
(){
void
0
!==
b
&&
b
(
e
)}),
d
=
this
.
parseTextures
(
a
.
textures
,
d
),
d
=
this
.
parseMaterials
(
a
.
materials
,
d
),
e
=
this
.
parseObject
(
a
.
object
,
c
,
d
);
void
0
!==
a
.
images
&&
0
!==
a
.
images
.
length
||
void
0
===
b
||
b
(
e
);
return
e
},
parseGeometries
:
function
(
a
){
var
b
=
{};
if
(
void
0
!==
a
)
for
(
var
c
=
new
THREE
.
JSONLoader
,
d
=
new
THREE
.
BufferGeometryLoader
,
e
=
0
,
g
=
a
.
length
;
e
<
g
;
e
++
){
var
f
,
h
=
a
[
e
];
switch
(
h
.
type
){
case
"
PlaneGeometry
"
:
case
"
PlaneBufferGeometry
"
:
f
=
new
THREE
[
h
.
type
](
h
.
width
,
h
.
height
,
h
.
widthSegments
,
h
.
heightSegments
);
break
;
case
"
BoxGeometry
"
:
case
"
CubeGeometry
"
:
f
=
new
THREE
.
BoxGeometry
(
h
.
width
,
h
.
height
,
h
.
depth
,
h
.
widthSegments
,
h
.
heightSegments
,
h
.
depthSegments
);
break
;
case
"
CircleBufferGeometry
"
:
f
=
new
THREE
.
CircleBufferGeometry
(
h
.
radius
,
h
.
segments
,
h
.
thetaStart
,
h
.
thetaLength
);
break
;
case
"
CircleGeometry
"
:
f
=
new
THREE
.
CircleGeometry
(
h
.
radius
,
h
.
segments
,
h
.
thetaStart
,
h
.
thetaLength
);
break
;
case
"
CylinderGeometry
"
:
f
=
new
THREE
.
CylinderGeometry
(
h
.
radiusTop
,
h
.
radiusBottom
,
h
.
height
,
h
.
radialSegments
,
h
.
heightSegments
,
h
.
openEnded
,
h
.
thetaStart
,
h
.
thetaLength
);
break
;
case
"
SphereGeometry
"
:
f
=
...
...
@@ -336,9 +336,9 @@ THREE.Material.prototype={constructor:THREE.Material,get needsUpdate(){return th
type
:
"
Material
"
,
generator
:
"
Material.toJSON
"
}};
b
.
uuid
=
this
.
uuid
;
b
.
type
=
this
.
type
;
""
!==
this
.
name
&&
(
b
.
name
=
this
.
name
);
this
.
color
instanceof
THREE
.
Color
&&
(
b
.
color
=
this
.
color
.
getHex
());
this
.
emissive
instanceof
THREE
.
Color
&&
(
b
.
emissive
=
this
.
emissive
.
getHex
());
this
.
specular
instanceof
THREE
.
Color
&&
(
b
.
specular
=
this
.
specular
.
getHex
());
void
0
!==
this
.
shininess
&&
(
b
.
shininess
=
this
.
shininess
);
this
.
map
instanceof
THREE
.
Texture
&&
(
b
.
map
=
this
.
map
.
toJSON
(
a
).
uuid
);
this
.
alphaMap
instanceof
THREE
.
Texture
&&
(
b
.
alphaMap
=
this
.
alphaMap
.
toJSON
(
a
).
uuid
);
this
.
lightMap
instanceof
THREE
.
Texture
&&
(
b
.
lightMap
=
this
.
lightMap
.
toJSON
(
a
).
uuid
);
this
.
bumpMap
instanceof
THREE
.
Texture
&&
(
b
.
bumpMap
=
this
.
bumpMap
.
toJSON
(
a
).
uuid
,
b
.
bumpScale
=
this
.
bumpScale
);
this
.
normalMap
instanceof
THREE
.
Texture
&&
(
b
.
normalMap
=
this
.
normalMap
.
toJSON
(
a
).
uuid
,
b
.
normalScale
=
this
.
normalScale
);
this
.
specularMap
instanceof
THREE
.
Texture
&&
(
b
.
specularMap
=
this
.
specularMap
.
toJSON
(
a
).
uuid
);
this
.
envMap
instanceof
THREE
.
Texture
&&
(
b
.
envMap
=
this
.
envMap
.
toJSON
(
a
).
uuid
,
b
.
reflectivity
=
this
.
reflectivity
);
void
0
!==
this
.
size
&&
(
b
.
size
=
this
.
size
);
void
0
!==
this
.
sizeAttenuation
&&
(
b
.
sizeAttenuation
=
this
.
sizeAttenuation
);
void
0
!==
this
.
vertexColors
&&
this
.
vertexColors
!==
THREE
.
NoColors
&&
(
b
.
vertexColors
=
this
.
vertexColors
);
void
0
!==
this
.
shading
&&
this
.
shading
!==
THREE
.
SmoothShading
&&
(
b
.
shading
=
this
.
shading
);
void
0
!==
this
.
blending
&&
this
.
blending
!==
THREE
.
NormalBlending
&&
(
b
.
blending
=
this
.
blending
);
void
0
!==
this
.
side
&&
this
.
side
!==
THREE
.
FrontSide
&&
(
b
.
side
=
this
.
side
);
1
>
this
.
opacity
&&
(
b
.
opacity
=
this
.
opacity
);
!
0
===
this
.
transparent
&&
(
b
.
transparent
=
this
.
transparent
);
0
<
this
.
alphaTest
&&
(
b
.
alphaTest
=
this
.
alphaTest
);
!
0
===
this
.
wireframe
&&
(
b
.
wireframe
=
this
.
wireframe
);
return
b
},
clone
:
function
(){
return
(
new
this
.
constructor
).
copy
(
this
)},
copy
:
function
(
a
){
this
.
name
=
a
.
name
;
this
.
side
=
a
.
side
;
this
.
opacity
=
a
.
opacity
;
this
.
transparent
=
a
.
transparent
;
this
.
blending
=
a
.
blending
;
this
.
blendSrc
=
a
.
blendSrc
;
this
.
blendDst
=
a
.
blendDst
;
this
.
blendEquation
=
a
.
blendEquation
;
this
.
blendSrcAlpha
=
a
.
blendSrcAlpha
;
this
.
blendDstAlpha
=
a
.
blendDstAlpha
;
this
.
blend
EquationAlpha
=
a
.
blendEquationAlpha
;
this
.
depthFunc
=
a
.
depthFunc
;
this
.
depthTest
=
a
.
depthTest
;
this
.
depthWrite
=
a
.
depthWrite
;
this
.
precision
=
a
.
precision
;
this
.
polygonOffset
=
a
.
polygonOffset
;
this
.
polygonOffsetFactor
=
a
.
polygonOffsetFactor
;
this
.
polygonOffsetUnits
=
a
.
polygonOffsetUnits
;
this
.
alphaTest
=
a
.
alphaTest
;
this
.
overdraw
=
a
.
overdraw
;
this
.
visible
=
a
.
visible
;
return
this
},
update
:
function
(){
this
.
dispatchEvent
({
type
:
"
update
"
})},
dispose
:
function
(){
this
.
dispatchEvent
({
type
:
"
dispose
"
})}};
THREE
.
EventDispatcher
.
prototype
.
apply
(
THREE
.
Material
.
prototype
)
;
THREE
.
MaterialIdCount
=
0
;
THREE
.
LineBasicMaterial
=
function
(
a
){
THREE
.
Material
.
call
(
this
);
this
.
type
=
"
LineBasicMaterial
"
;
this
.
color
=
new
THREE
.
Color
(
16777215
);
this
.
linewidth
=
1
;
this
.
linejoin
=
this
.
linecap
=
"
round
"
;
this
.
vertexColors
=
THREE
.
NoColors
;
this
.
fog
=!
0
;
this
.
setValues
(
a
)};
THREE
.
LineBasicMaterial
.
prototype
=
Object
.
create
(
THREE
.
Material
.
prototype
);
THREE
.
LineBasicMaterial
.
prototype
.
constructor
=
THREE
.
LineBasicMaterial
;
!
0
===
this
.
transparent
&&
(
b
.
transparent
=
this
.
transparent
);
0
<
this
.
alphaTest
&&
(
b
.
alphaTest
=
this
.
alphaTest
);
!
0
===
this
.
wireframe
&&
(
b
.
wireframe
=
this
.
wireframe
);
1
<
this
.
wireframeLinewidth
&&
(
b
.
wireframeLinewidth
=
this
.
wireframeLinewidth
);
return
b
},
clone
:
function
(){
return
(
new
this
.
constructor
).
copy
(
this
)},
copy
:
function
(
a
){
this
.
name
=
a
.
name
;
this
.
side
=
a
.
side
;
this
.
opacity
=
a
.
opacity
;
this
.
transparent
=
a
.
transparent
;
this
.
blending
=
a
.
blending
;
this
.
blendSrc
=
a
.
blendSrc
;
this
.
blendDst
=
a
.
blendDst
;
this
.
blendEquation
=
a
.
blendEquation
;
this
.
blend
SrcAlpha
=
a
.
blendSrcAlpha
;
this
.
blendDstAlpha
=
a
.
blendDstAlpha
;
this
.
blendEquationAlpha
=
a
.
blendEquationAlpha
;
this
.
depthFunc
=
a
.
depthFunc
;
this
.
depthTest
=
a
.
depthTest
;
this
.
depthWrite
=
a
.
depthWrite
;
this
.
precision
=
a
.
precision
;
this
.
polygonOffset
=
a
.
polygonOffset
;
this
.
polygonOffsetFactor
=
a
.
polygonOffsetFactor
;
this
.
polygonOffsetUnits
=
a
.
polygonOffsetUnits
;
this
.
alphaTest
=
a
.
alphaTest
;
this
.
overdraw
=
a
.
overdraw
;
this
.
visible
=
a
.
visible
;
return
this
},
update
:
function
(){
this
.
dispatchEvent
({
type
:
"
update
"
})},
dispose
:
function
(){
this
.
dispatchEvent
({
type
:
"
dispose
"
})}}
;
THREE
.
EventDispatcher
.
prototype
.
apply
(
THREE
.
Material
.
prototype
);
THREE
.
MaterialIdCount
=
0
;
THREE
.
LineBasicMaterial
=
function
(
a
){
THREE
.
Material
.
call
(
this
);
this
.
type
=
"
LineBasicMaterial
"
;
this
.
color
=
new
THREE
.
Color
(
16777215
);
this
.
linewidth
=
1
;
this
.
linejoin
=
this
.
linecap
=
"
round
"
;
this
.
vertexColors
=
THREE
.
NoColors
;
this
.
fog
=!
0
;
this
.
setValues
(
a
)};
THREE
.
LineBasicMaterial
.
prototype
=
Object
.
create
(
THREE
.
Material
.
prototype
);
THREE
.
LineBasicMaterial
.
prototype
.
constructor
=
THREE
.
LineBasicMaterial
;
THREE
.
LineBasicMaterial
.
prototype
.
copy
=
function
(
a
){
THREE
.
Material
.
prototype
.
copy
.
call
(
this
,
a
);
this
.
color
.
copy
(
a
.
color
);
this
.
linewidth
=
a
.
linewidth
;
this
.
linecap
=
a
.
linecap
;
this
.
linejoin
=
a
.
linejoin
;
this
.
vertexColors
=
a
.
vertexColors
;
this
.
fog
=
a
.
fog
;
return
this
};
THREE
.
LineDashedMaterial
=
function
(
a
){
THREE
.
Material
.
call
(
this
);
this
.
type
=
"
LineDashedMaterial
"
;
this
.
color
=
new
THREE
.
Color
(
16777215
);
this
.
scale
=
this
.
linewidth
=
1
;
this
.
dashSize
=
3
;
this
.
gapSize
=
1
;
this
.
vertexColors
=!
1
;
this
.
fog
=!
0
;
this
.
setValues
(
a
)};
THREE
.
LineDashedMaterial
.
prototype
=
Object
.
create
(
THREE
.
Material
.
prototype
);
THREE
.
LineDashedMaterial
.
prototype
.
constructor
=
THREE
.
LineDashedMaterial
;
THREE
.
LineDashedMaterial
.
prototype
.
copy
=
function
(
a
){
THREE
.
Material
.
prototype
.
copy
.
call
(
this
,
a
);
this
.
color
.
copy
(
a
.
color
);
this
.
linewidth
=
a
.
linewidth
;
this
.
scale
=
a
.
scale
;
this
.
dashSize
=
a
.
dashSize
;
this
.
gapSize
=
a
.
gapSize
;
this
.
vertexColors
=
a
.
vertexColors
;
this
.
fog
=
a
.
fog
;
return
this
};
THREE
.
MeshBasicMaterial
=
function
(
a
){
THREE
.
Material
.
call
(
this
);
this
.
type
=
"
MeshBasicMaterial
"
;
this
.
color
=
new
THREE
.
Color
(
16777215
);
this
.
aoMap
=
this
.
map
=
null
;
this
.
aoMapIntensity
=
1
;
this
.
envMap
=
this
.
alphaMap
=
this
.
specularMap
=
null
;
this
.
combine
=
THREE
.
MultiplyOperation
;
this
.
reflectivity
=
1
;
this
.
refractionRatio
=
.
98
;
this
.
fog
=!
0
;
this
.
shading
=
THREE
.
SmoothShading
;
this
.
wireframe
=!
1
;
this
.
wireframeLinewidth
=
1
;
this
.
wireframeLinejoin
=
this
.
wireframeLinecap
=
"
round
"
;
this
.
vertexColors
=
THREE
.
NoColors
;
this
.
morphTargets
=
this
.
skinning
=
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录