Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
fb2c4aa8
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,体验更适合开发者的 AI 搜索 >>
未验证
提交
fb2c4aa8
编写于
6月 27, 2020
作者:
M
Mr.doob
提交者:
GitHub
6月 27, 2020
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #19738 from Mugen87/dev43
GLTFLoader: Fix usage of ImageBitmapLoader.
上级
7df06a0e
41d6e9a7
变更
4
隐藏空白更改
内联
并排
Showing
4 changed file
with
8 addition
and
10 deletion
+8
-10
examples/js/loaders/GLTFLoader.js
examples/js/loaders/GLTFLoader.js
+2
-5
examples/jsm/loaders/GLTFLoader.js
examples/jsm/loaders/GLTFLoader.js
+2
-5
src/loaders/ImageBitmapLoader.d.ts
src/loaders/ImageBitmapLoader.d.ts
+2
-0
src/loaders/ImageBitmapLoader.js
src/loaders/ImageBitmapLoader.js
+2
-0
未找到文件。
examples/js/loaders/GLTFLoader.js
浏览文件 @
fb2c4aa8
...
...
@@ -1468,11 +1468,9 @@ THREE.GLTFLoader = ( function () {
// BufferGeometry caching
this
.
primitiveCache
=
{};
this
.
useImageBitmap
=
typeof
createImageBitmap
!==
'
undefined
'
&&
/Firefox/
.
test
(
navigator
.
userAgent
)
===
false
;
// Use an ImageBitmapLoader if imageBitmaps are supported. Moves much of the
// expensive work of uploading a texture to the GPU off the main thread.
if
(
t
his
.
useImageBitmap
)
{
if
(
t
ypeof
createImageBitmap
!==
'
undefined
'
&&
/Firefox/
.
test
(
navigator
.
userAgent
)
===
false
)
{
this
.
textureLoader
=
new
THREE
.
ImageBitmapLoader
(
this
.
options
.
manager
);
...
...
@@ -1956,7 +1954,6 @@ THREE.GLTFLoader = ( function () {
var
parser
=
this
;
var
json
=
this
.
json
;
var
options
=
this
.
options
;
var
useImageBitmap
=
this
.
useImageBitmap
;
var
textureLoader
=
this
.
textureLoader
;
var
URL
=
self
.
URL
||
self
.
webkitURL
;
...
...
@@ -2013,7 +2010,7 @@ THREE.GLTFLoader = ( function () {
var
onLoad
=
resolve
;
if
(
useImageBitmap
)
{
if
(
loader
.
isImageBitmapLoader
===
true
)
{
onLoad
=
function
(
imageBitmap
)
{
...
...
examples/jsm/loaders/GLTFLoader.js
浏览文件 @
fb2c4aa8
...
...
@@ -1533,11 +1533,9 @@ var GLTFLoader = ( function () {
// BufferGeometry caching
this
.
primitiveCache
=
{};
this
.
useImageBitmap
=
typeof
createImageBitmap
!==
'
undefined
'
&&
/Firefox/
.
test
(
navigator
.
userAgent
)
===
false
;
// Use an ImageBitmapLoader if imageBitmaps are supported. Moves much of the
// expensive work of uploading a texture to the GPU off the main thread.
if
(
t
his
.
useImageBitmap
)
{
if
(
t
ypeof
createImageBitmap
!==
'
undefined
'
&&
/Firefox/
.
test
(
navigator
.
userAgent
)
===
false
)
{
this
.
textureLoader
=
new
ImageBitmapLoader
(
this
.
options
.
manager
);
...
...
@@ -2021,7 +2019,6 @@ var GLTFLoader = ( function () {
var
parser
=
this
;
var
json
=
this
.
json
;
var
options
=
this
.
options
;
var
useImageBitmap
=
this
.
useImageBitmap
;
var
textureLoader
=
this
.
textureLoader
;
var
URL
=
self
.
URL
||
self
.
webkitURL
;
...
...
@@ -2078,7 +2075,7 @@ var GLTFLoader = ( function () {
var
onLoad
=
resolve
;
if
(
useImageBitmap
)
{
if
(
loader
.
isImageBitmapLoader
===
true
)
{
onLoad
=
function
(
imageBitmap
)
{
...
...
src/loaders/ImageBitmapLoader.d.ts
浏览文件 @
fb2c4aa8
...
...
@@ -7,6 +7,8 @@ export class ImageBitmapLoader extends Loader {
options
:
undefined
|
object
;
readonly
isImageBitmapLoader
:
true
;
setOptions
(
options
:
object
):
ImageBitmapLoader
;
load
(
url
:
string
,
...
...
src/loaders/ImageBitmapLoader.js
浏览文件 @
fb2c4aa8
...
...
@@ -30,6 +30,8 @@ ImageBitmapLoader.prototype = Object.assign( Object.create( Loader.prototype ),
constructor
:
ImageBitmapLoader
,
isImageBitmapLoader
:
true
,
setOptions
:
function
setOptions
(
options
)
{
this
.
options
=
options
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录