Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
94125d9e
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,发现更多精彩内容 >>
提交
94125d9e
编写于
5月 15, 2014
作者:
M
Mr.doob
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
More tweaks to Texture.
上级
dd089570
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
63 addition
and
47 deletion
+63
-47
examples/js/loaders/DDSLoader.js
examples/js/loaders/DDSLoader.js
+12
-12
examples/webgl_loader_gltf.html
examples/webgl_loader_gltf.html
+6
-6
examples/webgl_materials_cubemap_escher.html
examples/webgl_materials_cubemap_escher.html
+4
-1
examples/webgl_materials_texture_compressed.html
examples/webgl_materials_texture_compressed.html
+1
-1
src/extras/ImageUtils.js
src/extras/ImageUtils.js
+30
-9
src/loaders/Loader.js
src/loaders/Loader.js
+8
-3
src/textures/Texture.js
src/textures/Texture.js
+2
-15
未找到文件。
examples/js/loaders/DDSLoader.js
浏览文件 @
94125d9e
...
...
@@ -34,13 +34,13 @@ THREE.DDSLoader.prototype = {
var
loader
=
new
THREE
.
XHRLoader
();
loader
.
setResponseType
(
'
arraybuffer
'
);
var
load
Next
=
function
(
)
{
loader
.
load
(
url
[
loaded
],
function
(
buffer
)
{
var
load
Texture
=
function
(
i
)
{
loader
.
load
(
url
[
i
],
function
(
buffer
)
{
var
dds
=
scope
.
parse
(
buffer
,
true
);
images
[
loaded
]
=
{
images
[
i
]
=
{
width
:
dds
.
width
,
height
:
dds
.
height
,
format
:
dds
.
format
,
...
...
@@ -49,24 +49,24 @@ THREE.DDSLoader.prototype = {
loaded
+=
1
;
if
(
loaded
===
url
.
length
)
{
if
(
loaded
===
6
)
{
texture
.
format
=
dds
.
format
;
texture
.
needsUpdate
=
true
;
if
(
onLoad
)
onLoad
(
texture
);
}
else
{
loadNext
();
}
}
);
}
;
}
loadNext
();
for
(
var
i
=
0
,
il
=
url
.
length
;
i
<
il
;
++
i
)
{
loadTexture
(
i
);
}
}
else
{
...
...
@@ -344,4 +344,4 @@ THREE.DDSLoader.prototype = {
}
};
\ No newline at end of file
};
examples/webgl_loader_gltf.html
浏览文件 @
94125d9e
...
...
@@ -123,12 +123,12 @@
</div>
</div>
</div>
<script
src=
"../build/three.js"
></script>
<script
src=
"
./
js/controls/OrbitControls.js"
></script>
<script
src=
"
./
js/loaders/gltf/glTF-parser.js"
></script>
<script
src=
"
./
js/loaders/gltf/glTFLoader.js"
></script>
<script
src=
"
./
js/loaders/gltf/glTFLoaderUtils.js"
></script>
<script
src=
"
./
js/loaders/gltf/glTFAnimation.js"
></script>
<script
src=
"../build/three.
min.
js"
></script>
<script
src=
"js/controls/OrbitControls.js"
></script>
<script
src=
"js/loaders/gltf/glTF-parser.js"
></script>
<script
src=
"js/loaders/gltf/glTFLoader.js"
></script>
<script
src=
"js/loaders/gltf/glTFLoaderUtils.js"
></script>
<script
src=
"js/loaders/gltf/glTFAnimation.js"
></script>
<script>
var
orbitControls
=
null
;
...
...
examples/webgl_materials_cubemap_escher.html
浏览文件 @
94125d9e
...
...
@@ -31,6 +31,7 @@
</div>
<script
src=
"../build/three.min.js"
></script>
<script
src=
"js/loaders/DDSLoader.js"
></script>
<script
src=
"js/Detector.js"
></script>
<script
src=
"js/libs/stats.min.js"
></script>
...
...
@@ -86,7 +87,9 @@
r
+
"
py.dds
"
,
r
+
"
ny.dds
"
,
r
+
"
pz.dds
"
,
r
+
"
nz.dds
"
];
var
textureCube
=
THREE
.
ImageUtils
.
loadCompressedTextureCube
(
urls
);
var
loader
=
new
THREE
.
DDSLoader
();
var
textureCube
=
loader
.
load
(
urls
);
var
material
=
new
THREE
.
MeshBasicMaterial
(
{
color
:
0xffffff
,
envMap
:
textureCube
}
)
var
geometry
=
new
THREE
.
SphereGeometry
(
100
,
96
,
64
);
...
...
examples/webgl_materials_texture_compressed.html
浏览文件 @
94125d9e
...
...
@@ -71,7 +71,7 @@
*/
var
loader
=
new
THREE
.
DDSLoader
();
var
map1
=
loader
.
load
(
'
textures/compressed/disturb_dxt1_nomip.dds
'
);
map1
.
minFilter
=
map1
.
magFilter
=
THREE
.
LinearFilter
;
map1
.
anisotropy
=
4
;
...
...
src/extras/ImageUtils.js
浏览文件 @
94125d9e
...
...
@@ -38,7 +38,6 @@ THREE.ImageUtils = {
loadTextureCube
:
function
(
array
,
mapping
,
onLoad
,
onError
)
{
var
images
=
[];
images
.
loadCount
=
0
;
var
loader
=
new
THREE
.
ImageLoader
();
loader
.
crossOrigin
=
this
.
crossOrigin
;
...
...
@@ -48,28 +47,50 @@ THREE.ImageUtils = {
// no flipping needed for cube textures
texture
.
flipY
=
false
;
var
loaded
=
0
;
var
loadTexture
=
function
(
i
)
{
loader
.
load
(
array
[
i
],
function
(
image
)
{
for
(
var
i
=
0
,
il
=
array
.
length
;
i
<
il
;
++
i
)
{
var
cubeImage
=
loader
.
load
(
array
[
i
],
function
()
{
texture
.
images
[
i
]
=
image
;
images
.
loadCount
+=
1
;
loaded
+=
1
;
if
(
images
.
loadCount
===
6
)
{
if
(
loaded
===
6
)
{
texture
.
needsUpdate
=
true
;
if
(
onLoad
)
onLoad
(
texture
);
}
}
);
images
[
i
]
=
cubeImage
;
}
for
(
var
i
=
0
,
il
=
array
.
length
;
i
<
il
;
++
i
)
{
loadTexture
(
i
);
}
return
texture
;
},
loadCompressedTexture
:
function
()
{
console
.
error
(
'
THREE.ImageUtils.loadCompressedTexture has been removed. Use THREE.DDSLoader instead.
'
)
},
loadCompressedTextureCube
:
function
()
{
console
.
error
(
'
THREE.ImageUtils.loadCompressedTextureCube has been removed. Use THREE.DDSLoader instead.
'
)
},
getNormalMap
:
function
(
image
,
depth
)
{
...
...
src/loaders/Loader.js
浏览文件 @
94125d9e
...
...
@@ -138,9 +138,14 @@ THREE.Loader.prototype = {
var
width
=
nearest_pow2
(
image
.
width
);
var
height
=
nearest_pow2
(
image
.
height
);
texture
.
image
.
width
=
width
;
texture
.
image
.
height
=
height
;
texture
.
image
.
getContext
(
'
2d
'
).
drawImage
(
image
,
0
,
0
,
width
,
height
);
var
canvas
=
document
.
createElement
(
'
canvas
'
);
canvas
.
width
=
width
;
canvas
.
height
=
height
;
var
context
=
canvas
.
getContext
(
'
2d
'
);
context
.
drawImage
(
image
,
0
,
0
,
width
,
height
);
texture
.
image
=
canvas
;
}
else
{
...
...
src/textures/Texture.js
浏览文件 @
94125d9e
...
...
@@ -35,25 +35,12 @@ THREE.Texture = function ( image, mapping, wrapS, wrapT, magFilter, minFilter, f
this
.
flipY
=
true
;
this
.
unpackAlignment
=
4
;
// valid values: 1, 2, 4, 8 (see http://www.khronos.org/opengles/sdk/docs/man/xhtml/glPixelStorei.xml)
this
.
_needsUpdate
=
tru
e
;
this
.
_needsUpdate
=
fals
e
;
this
.
onUpdate
=
null
;
};
THREE
.
Texture
.
DEFAULT_IMAGE
=
(
function
()
{
var
canvas
=
document
.
createElement
(
'
canvas
'
);
canvas
.
width
=
8
;
canvas
.
height
=
8
;
var
context
=
canvas
.
getContext
(
'
2d
'
);
context
.
fillStyle
=
'
#ff0000
'
;
context
.
fillRect
(
0
,
0
,
canvas
.
width
,
canvas
.
height
);
return
canvas
;
}()
);
THREE
.
Texture
.
DEFAULT_IMAGE
=
undefined
;
THREE
.
Texture
.
DEFAULT_MAPPING
=
new
THREE
.
UVMapping
();
THREE
.
Texture
.
prototype
=
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录