Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
5ec5d6d6
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,发现更多精彩内容 >>
提交
5ec5d6d6
编写于
6月 19, 2018
作者:
M
Mugen87
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Loaders: Harmonize crossOrigin default value
上级
5aff15a3
变更
17
隐藏空白更改
内联
并排
Showing
17 changed file
with
46 addition
and
31 deletion
+46
-31
examples/js/loaders/AssimpJSONLoader.js
examples/js/loaders/AssimpJSONLoader.js
+4
-1
examples/js/loaders/AssimpLoader.js
examples/js/loaders/AssimpLoader.js
+4
-3
examples/js/loaders/BinaryLoader.js
examples/js/loaders/BinaryLoader.js
+4
-1
examples/js/loaders/ColladaLoader.js
examples/js/loaders/ColladaLoader.js
+3
-1
examples/js/loaders/DRACOLoader.js
examples/js/loaders/DRACOLoader.js
+2
-10
examples/js/loaders/FBXLoader.js
examples/js/loaders/FBXLoader.js
+12
-1
examples/js/loaders/GLTFLoader.js
examples/js/loaders/GLTFLoader.js
+1
-1
examples/js/loaders/LoaderSupport.js
examples/js/loaders/LoaderSupport.js
+1
-1
examples/js/loaders/MMDLoader.js
examples/js/loaders/MMDLoader.js
+4
-4
examples/js/loaders/MTLLoader.js
examples/js/loaders/MTLLoader.js
+2
-1
examples/js/loaders/VRMLLoader.js
examples/js/loaders/VRMLLoader.js
+2
-1
examples/js/loaders/VRMLoader.js
examples/js/loaders/VRMLoader.js
+1
-1
examples/js/loaders/deprecated/LegacyGLTFLoader.js
examples/js/loaders/deprecated/LegacyGLTFLoader.js
+2
-1
src/loaders/CubeTextureLoader.js
src/loaders/CubeTextureLoader.js
+1
-1
src/loaders/ImageLoader.js
src/loaders/ImageLoader.js
+1
-1
src/loaders/Loader.js
src/loaders/Loader.js
+1
-1
src/loaders/TextureLoader.js
src/loaders/TextureLoader.js
+1
-1
未找到文件。
examples/js/loaders/AssimpJSONLoader.js
浏览文件 @
5ec5d6d6
...
...
@@ -21,7 +21,7 @@ THREE.AssimpJSONLoader.prototype = {
constructor
:
THREE
.
AssimpJSONLoader
,
crossOrigin
:
'
A
nonymous
'
,
crossOrigin
:
'
a
nonymous
'
,
load
:
function
(
url
,
onLoad
,
onProgress
,
onError
)
{
...
...
@@ -67,6 +67,7 @@ THREE.AssimpJSONLoader.prototype = {
setCrossOrigin
:
function
(
value
)
{
this
.
crossOrigin
=
value
;
return
this
;
},
...
...
@@ -221,8 +222,10 @@ THREE.AssimpJSONLoader.prototype = {
case
'
$mat.opacity
'
:
if
(
value
<
1
)
{
material
.
opacity
=
value
;
material
.
transparent
=
true
;
}
break
;
...
...
examples/js/loaders/AssimpLoader.js
浏览文件 @
5ec5d6d6
...
...
@@ -12,7 +12,7 @@ THREE.AssimpLoader.prototype = {
constructor
:
THREE
.
AssimpLoader
,
crossOrigin
:
'
A
nonymous
'
,
crossOrigin
:
'
a
nonymous
'
,
load
:
function
(
url
,
onLoad
,
onProgress
,
onError
)
{
...
...
@@ -34,6 +34,7 @@ THREE.AssimpLoader.prototype = {
setCrossOrigin
:
function
(
value
)
{
this
.
crossOrigin
=
value
;
return
this
;
},
...
...
@@ -1129,7 +1130,7 @@ THREE.AssimpLoader.prototype = {
}
if
(
!
key
)
{
return
null
;
}
else
if
(
nextKey
)
{
...
...
@@ -1150,7 +1151,7 @@ THREE.AssimpLoader.prototype = {
var
l
=
T
/
dT
;
return
lerp
(
key
.
mValue
.
toTHREE
(),
nextKey
.
mValue
.
toTHREE
(),
l
);
}
}
...
...
examples/js/loaders/BinaryLoader.js
浏览文件 @
5ec5d6d6
...
...
@@ -19,7 +19,7 @@ THREE.BinaryLoader.prototype = {
constructor
:
THREE
.
BinaryLoader
,
crossOrigin
:
'
A
nonymous
'
,
crossOrigin
:
'
a
nonymous
'
,
// Load models generated by slim OBJ converter with BINARY option (converter_obj_three_slim.py -t binary)
// - binary models consist of two files: JS and BIN
...
...
@@ -66,18 +66,21 @@ THREE.BinaryLoader.prototype = {
setBinaryPath
:
function
(
value
)
{
this
.
binaryPath
=
value
;
return
this
;
},
setCrossOrigin
:
function
(
value
)
{
this
.
crossOrigin
=
value
;
return
this
;
},
setTexturePath
:
function
(
value
)
{
this
.
texturePath
=
value
;
return
this
;
},
...
...
examples/js/loaders/ColladaLoader.js
浏览文件 @
5ec5d6d6
...
...
@@ -13,7 +13,7 @@ THREE.ColladaLoader.prototype = {
constructor
:
THREE
.
ColladaLoader
,
crossOrigin
:
'
A
nonymous
'
,
crossOrigin
:
'
a
nonymous
'
,
load
:
function
(
url
,
onLoad
,
onProgress
,
onError
)
{
...
...
@@ -33,6 +33,7 @@ THREE.ColladaLoader.prototype = {
setPath
:
function
(
value
)
{
this
.
path
=
value
;
return
this
;
},
...
...
@@ -49,6 +50,7 @@ THREE.ColladaLoader.prototype = {
setCrossOrigin
:
function
(
value
)
{
this
.
crossOrigin
=
value
;
return
this
;
},
...
...
examples/js/loaders/DRACOLoader.js
浏览文件 @
5ec5d6d6
...
...
@@ -42,9 +42,6 @@ THREE.DRACOLoader.prototype = {
var
loader
=
new
THREE
.
FileLoader
(
scope
.
manager
);
loader
.
setPath
(
this
.
path
);
loader
.
setResponseType
(
'
arraybuffer
'
);
if
(
this
.
crossOrigin
!==
undefined
)
{
loader
.
crossOrigin
=
this
.
crossOrigin
;
}
loader
.
load
(
url
,
function
(
blob
)
{
scope
.
decodeDracoFile
(
blob
,
onLoad
);
},
onProgress
,
onError
);
...
...
@@ -55,11 +52,6 @@ THREE.DRACOLoader.prototype = {
return
this
;
},
setCrossOrigin
:
function
(
value
)
{
this
.
crossOrigin
=
value
;
return
this
;
},
setVerbosity
:
function
(
level
)
{
this
.
verbosity
=
level
;
return
this
;
...
...
@@ -146,7 +138,7 @@ THREE.DRACOLoader.prototype = {
},
addAttributeToGeometry
:
function
(
dracoDecoder
,
decoder
,
dracoGeometry
,
attributeName
,
attributeType
,
attribute
,
attributeName
,
attributeType
,
attribute
,
geometry
,
geometryBuffer
)
{
if
(
attribute
.
ptr
===
0
)
{
var
errorMsg
=
'
THREE.DRACOLoader: No attribute
'
+
attributeName
;
...
...
@@ -224,7 +216,7 @@ THREE.DRACOLoader.prototype = {
throw
new
Error
(
errorMsg
);
}
// Copy data from decoder.
for
(
var
i
=
0
;
i
<
numValues
;
i
++
)
{
geometryBuffer
[
attributeName
][
i
]
=
attributeData
.
GetValue
(
i
);
...
...
examples/js/loaders/FBXLoader.js
浏览文件 @
5ec5d6d6
...
...
@@ -32,6 +32,8 @@
Object
.
assign
(
THREE
.
FBXLoader
.
prototype
,
{
crossOrigin
:
'
anonymous
'
,
load
:
function
(
url
,
onLoad
,
onProgress
,
onError
)
{
var
self
=
this
;
...
...
@@ -63,6 +65,13 @@
},
setCrossOrigin
:
function
(
value
)
{
this
.
crossOrigin
=
value
;
return
this
;
},
parse
:
function
(
FBXBuffer
,
resourceDirectory
)
{
var
FBXTree
;
...
...
@@ -93,9 +102,11 @@
// console.log( FBXTree );
var
textureLoader
=
new
THREE
.
TextureLoader
(
this
.
manager
).
setPath
(
resourceDirectory
).
setCrossOrigin
(
this
.
crossOrigin
);
var
connections
=
parseConnections
(
FBXTree
);
var
images
=
parseImages
(
FBXTree
);
var
textures
=
parseTextures
(
FBXTree
,
new
THREE
.
TextureLoader
(
this
.
manager
).
setPath
(
resourceDirectory
)
,
images
,
connections
);
var
textures
=
parseTextures
(
FBXTree
,
textureLoader
,
images
,
connections
);
var
materials
=
parseMaterials
(
FBXTree
,
textures
,
connections
);
var
deformers
=
parseDeformers
(
FBXTree
,
connections
);
var
geometryMap
=
parseGeometries
(
FBXTree
,
connections
,
deformers
);
...
...
examples/js/loaders/GLTFLoader.js
浏览文件 @
5ec5d6d6
...
...
@@ -19,7 +19,7 @@ THREE.GLTFLoader = ( function () {
constructor
:
GLTFLoader
,
crossOrigin
:
'
A
nonymous
'
,
crossOrigin
:
'
a
nonymous
'
,
load
:
function
(
url
,
onLoad
,
onProgress
,
onError
)
{
...
...
examples/js/loaders/LoaderSupport.js
浏览文件 @
5ec5d6d6
...
...
@@ -1240,7 +1240,7 @@ THREE.LoaderSupport.WorkerDirector = (function () {
this
.
maxQueueSize
=
MAX_QUEUE_SIZE
;
this
.
maxWebWorkers
=
MAX_WEB_WORKER
;
this
.
crossOrigin
=
null
;
this
.
crossOrigin
=
'
anonymous
'
;
if
(
!
Validator
.
isValid
(
classDef
)
)
throw
'
Provided invalid classDef:
'
+
classDef
;
...
...
examples/js/loaders/MMDLoader.js
浏览文件 @
5ec5d6d6
...
...
@@ -50,7 +50,7 @@ THREE.MMDLoader = ( function () {
constructor
:
MMDLoader
,
crossOrigin
:
undefined
,
crossOrigin
:
'
anonymous
'
,
/**
* @param {string} value
...
...
@@ -329,7 +329,7 @@ THREE.MMDLoader = ( function () {
constructor
:
MeshBuilder
,
crossOrigin
:
undefined
,
crossOrigin
:
'
anonymous
'
,
/**
* @param {string} crossOrigin
...
...
@@ -876,7 +876,7 @@ THREE.MMDLoader = ( function () {
constructor
:
MaterialBuilder
,
crossOrigin
:
undefined
,
crossOrigin
:
'
anonymous
'
,
texturePath
:
undefined
,
...
...
@@ -946,7 +946,7 @@ THREE.MMDLoader = ( function () {
params
.
shininess
=
Math
.
max
(
material
.
shininess
,
1
e
-
4
);
// to prevent pow( 0.0, 0.0 )
params
.
transparent
=
params
.
opacity
!==
1.0
;
//
//
params
.
skinning
=
geometry
.
bones
.
length
>
0
?
true
:
false
;
params
.
morphTargets
=
geometry
.
morphTargets
.
length
>
0
?
true
:
false
;
...
...
examples/js/loaders/MTLLoader.js
浏览文件 @
5ec5d6d6
...
...
@@ -208,11 +208,12 @@ THREE.MTLLoader.MaterialCreator.prototype = {
constructor
:
THREE
.
MTLLoader
.
MaterialCreator
,
crossOrigin
:
'
A
nonymous
'
,
crossOrigin
:
'
a
nonymous
'
,
setCrossOrigin
:
function
(
value
)
{
this
.
crossOrigin
=
value
;
return
this
;
},
...
...
examples/js/loaders/VRMLLoader.js
浏览文件 @
5ec5d6d6
...
...
@@ -26,7 +26,7 @@ THREE.VRMLLoader.prototype = {
recordingFieldname
:
null
,
crossOrigin
:
'
A
nonymous
'
,
crossOrigin
:
'
a
nonymous
'
,
load
:
function
(
url
,
onLoad
,
onProgress
,
onError
)
{
...
...
@@ -44,6 +44,7 @@ THREE.VRMLLoader.prototype = {
setCrossOrigin
:
function
(
value
)
{
this
.
crossOrigin
=
value
;
return
this
;
},
...
...
examples/js/loaders/VRMLoader.js
浏览文件 @
5ec5d6d6
...
...
@@ -26,7 +26,7 @@ THREE.VRMLoader = ( function () {
constructor
:
VRMLoader
,
crossOrigin
:
'
A
nonymous
'
,
crossOrigin
:
'
a
nonymous
'
,
load
:
function
(
url
,
onLoad
,
onProgress
,
onError
)
{
...
...
examples/js/loaders/deprecated/LegacyGLTFLoader.js
浏览文件 @
5ec5d6d6
...
...
@@ -17,7 +17,7 @@ THREE.LegacyGLTFLoader = ( function () {
constructor
:
LegacyGLTFLoader
,
crossOrigin
:
'
A
nonymous
'
,
crossOrigin
:
'
a
nonymous
'
,
load
:
function
(
url
,
onLoad
,
onProgress
,
onError
)
{
...
...
@@ -40,6 +40,7 @@ THREE.LegacyGLTFLoader = ( function () {
setCrossOrigin
:
function
(
value
)
{
this
.
crossOrigin
=
value
;
return
this
;
},
...
...
src/loaders/CubeTextureLoader.js
浏览文件 @
5ec5d6d6
...
...
@@ -15,7 +15,7 @@ function CubeTextureLoader( manager ) {
Object
.
assign
(
CubeTextureLoader
.
prototype
,
{
crossOrigin
:
'
A
nonymous
'
,
crossOrigin
:
'
a
nonymous
'
,
load
:
function
(
urls
,
onLoad
,
onProgress
,
onError
)
{
...
...
src/loaders/ImageLoader.js
浏览文件 @
5ec5d6d6
...
...
@@ -14,7 +14,7 @@ function ImageLoader( manager ) {
Object
.
assign
(
ImageLoader
.
prototype
,
{
crossOrigin
:
'
A
nonymous
'
,
crossOrigin
:
'
a
nonymous
'
,
load
:
function
(
url
,
onLoad
,
onProgress
,
onError
)
{
...
...
src/loaders/Loader.js
浏览文件 @
5ec5d6d6
...
...
@@ -61,7 +61,7 @@ Loader.Handlers = {
Object
.
assign
(
Loader
.
prototype
,
{
crossOrigin
:
undefined
,
crossOrigin
:
'
anonymous
'
,
onLoadStart
:
function
()
{},
...
...
src/loaders/TextureLoader.js
浏览文件 @
5ec5d6d6
...
...
@@ -16,7 +16,7 @@ function TextureLoader( manager ) {
Object
.
assign
(
TextureLoader
.
prototype
,
{
crossOrigin
:
'
A
nonymous
'
,
crossOrigin
:
'
a
nonymous
'
,
load
:
function
(
url
,
onLoad
,
onProgress
,
onError
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录