Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
Ablesons
three.js
提交
0f5e69ce
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,发现更多精彩内容 >>
提交
0f5e69ce
编写于
1月 16, 2016
作者:
M
Mugen87
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
removed deprecated THREE.ImageUtils.loadTextureCube
上级
d1294a24
变更
26
隐藏空白更改
内联
并排
Showing
26 changed file
with
68 addition
and
51 deletion
+68
-51
docs/scenes/js/material.js
docs/scenes/js/material.js
+2
-2
examples/js/loaders/deprecated/SceneLoader.js
examples/js/loaders/deprecated/SceneLoader.js
+2
-1
examples/misc_fps.html
examples/misc_fps.html
+1
-1
examples/webgl_effects_anaglyph.html
examples/webgl_effects_anaglyph.html
+1
-1
examples/webgl_effects_parallaxbarrier.html
examples/webgl_effects_parallaxbarrier.html
+6
-4
examples/webgl_effects_stereo.html
examples/webgl_effects_stereo.html
+3
-1
examples/webgl_geometry_teapot.html
examples/webgl_geometry_teapot.html
+6
-4
examples/webgl_loader_ctm_materials.html
examples/webgl_loader_ctm_materials.html
+6
-5
examples/webgl_loader_utf8.html
examples/webgl_loader_utf8.html
+1
-1
examples/webgl_marchingcubes.html
examples/webgl_marchingcubes.html
+2
-2
examples/webgl_materials_cars.html
examples/webgl_materials_cars.html
+6
-4
examples/webgl_materials_cubemap.html
examples/webgl_materials_cubemap.html
+2
-2
examples/webgl_materials_cubemap_balls_reflection.html
examples/webgl_materials_cubemap_balls_reflection.html
+1
-1
examples/webgl_materials_cubemap_balls_refraction.html
examples/webgl_materials_cubemap_balls_refraction.html
+3
-1
examples/webgl_materials_cubemap_escher.html
examples/webgl_materials_cubemap_escher.html
+7
-5
examples/webgl_materials_cubemap_refraction.html
examples/webgl_materials_cubemap_refraction.html
+8
-5
examples/webgl_materials_displacementmap.html
examples/webgl_materials_displacementmap.html
+1
-1
examples/webgl_materials_envmaps.html
examples/webgl_materials_envmaps.html
+2
-2
examples/webgl_materials_shaders_fresnel.html
examples/webgl_materials_shaders_fresnel.html
+1
-1
examples/webgl_materials_variations_basic.html
examples/webgl_materials_variations_basic.html
+1
-1
examples/webgl_materials_variations_lambert.html
examples/webgl_materials_variations_lambert.html
+1
-1
examples/webgl_materials_variations_phong.html
examples/webgl_materials_variations_phong.html
+1
-1
examples/webgl_materials_variations_standard.html
examples/webgl_materials_variations_standard.html
+1
-1
examples/webgl_materials_variations_standard2.html
examples/webgl_materials_variations_standard2.html
+1
-1
examples/webgl_performance_doublesided.html
examples/webgl_performance_doublesided.html
+1
-1
examples/webgl_shaders_tonemapping.html
examples/webgl_shaders_tonemapping.html
+1
-1
未找到文件。
docs/scenes/js/material.js
浏览文件 @
0f5e69ce
...
...
@@ -104,10 +104,10 @@ var envMaps = (function () {
path
+
'
pz
'
+
format
,
path
+
'
nz
'
+
format
];
var
reflectionCube
=
THREE
.
ImageUtils
.
loadTextureCube
(
urls
);
var
reflectionCube
=
new
THREE
.
CubeTextureLoader
().
load
(
urls
);
reflectionCube
.
format
=
THREE
.
RGBFormat
;
var
refractionCube
=
THREE
.
ImageUtils
.
loadTextureCube
(
urls
);
var
refractionCube
=
new
THREE
.
CubeTextureLoader
().
load
(
urls
);
refractionCube
.
mapping
=
THREE
.
CubeRefractionMapping
;
refractionCube
.
format
=
THREE
.
RGBFormat
;
...
...
examples/js/loaders/deprecated/SceneLoader.js
浏览文件 @
0f5e69ce
...
...
@@ -910,7 +910,8 @@ THREE.SceneLoader.prototype = {
}
else
{
texture
=
THREE
.
ImageUtils
.
loadTextureCube
(
url_array
,
textureJSON
.
mapping
,
generateTextureCallback
(
count
)
);
texture
=
new
THREE
.
CubeTextureLoader
().
load
(
urls
,
generateTextureCallback
(
count
)
);
texture
.
mapping
=
textureJSON
.
mapping
;
}
...
...
examples/misc_fps.html
浏览文件 @
0f5e69ce
...
...
@@ -214,7 +214,7 @@
// init 3D stuff
function
makeSkybox
(
urls
,
size
)
{
var
skyboxCubemap
=
THREE
.
ImageUtils
.
loadTextureCube
(
urls
);
var
skyboxCubemap
=
new
THREE
.
CubeTextureLoader
().
load
(
urls
);
skyboxCubemap
.
format
=
THREE
.
RGBFormat
;
var
skyboxShader
=
THREE
.
ShaderLib
[
'
cube
'
];
...
...
examples/webgl_effects_anaglyph.html
浏览文件 @
0f5e69ce
...
...
@@ -85,7 +85,7 @@
path
+
'
pz
'
+
format
,
path
+
'
nz
'
+
format
];
var
textureCube
=
THREE
.
ImageUtils
.
loadTextureCube
(
urls
);
var
textureCube
=
new
THREE
.
CubeTextureLoader
().
load
(
urls
);
var
material
=
new
THREE
.
MeshBasicMaterial
(
{
color
:
0xffffff
,
envMap
:
textureCube
}
);
for
(
var
i
=
0
;
i
<
500
;
i
++
)
{
...
...
examples/webgl_effects_parallaxbarrier.html
浏览文件 @
0f5e69ce
...
...
@@ -225,11 +225,13 @@
document
.
addEventListener
(
'
mousemove
'
,
onDocumentMouseMove
,
false
);
var
r
=
"
textures/cube/Bridge2/
"
;
var
urls
=
[
r
+
"
posx.jpg
"
,
r
+
"
negx.jpg
"
,
r
+
"
posy.jpg
"
,
r
+
"
negy.jpg
"
,
r
+
"
posz.jpg
"
,
r
+
"
negz.jpg
"
];
var
urls
=
[
r
+
"
posx.jpg
"
,
r
+
"
negx.jpg
"
,
r
+
"
posy.jpg
"
,
r
+
"
negy.jpg
"
,
r
+
"
posz.jpg
"
,
r
+
"
negz.jpg
"
];
var
textureCube
=
THREE
.
ImageUtils
.
loadTextureCube
(
urls
);
var
textureCube
=
new
THREE
.
CubeTextureLoader
().
load
(
urls
);
// common materials
...
...
examples/webgl_effects_stereo.html
浏览文件 @
0f5e69ce
...
...
@@ -86,7 +86,9 @@
path
+
'
pz
'
+
format
,
path
+
'
nz
'
+
format
];
var
textureCube
=
THREE
.
ImageUtils
.
loadTextureCube
(
urls
,
THREE
.
CubeRefractionMapping
);
var
textureCube
=
new
THREE
.
CubeTextureLoader
().
load
(
urls
);
textureCube
.
mapping
=
THREE
.
CubeRefractionMapping
;
var
material
=
new
THREE
.
MeshBasicMaterial
(
{
color
:
0xffffff
,
envMap
:
textureCube
,
refractionRatio
:
0.95
}
);
for
(
var
i
=
0
;
i
<
500
;
i
++
)
{
...
...
examples/webgl_geometry_teapot.html
浏览文件 @
0f5e69ce
...
...
@@ -121,11 +121,13 @@
// REFLECTION MAP
var
path
=
"
textures/cube/skybox/
"
;
var
urls
=
[
path
+
"
px.jpg
"
,
path
+
"
nx.jpg
"
,
path
+
"
py.jpg
"
,
path
+
"
ny.jpg
"
,
path
+
"
pz.jpg
"
,
path
+
"
nz.jpg
"
];
var
urls
=
[
path
+
"
px.jpg
"
,
path
+
"
nx.jpg
"
,
path
+
"
py.jpg
"
,
path
+
"
ny.jpg
"
,
path
+
"
pz.jpg
"
,
path
+
"
nz.jpg
"
];
var
textureCube
=
THREE
.
ImageUtils
.
loadTextureCube
(
urls
);
var
textureCube
=
new
THREE
.
CubeTextureLoader
().
load
(
urls
);
// MATERIALS
var
materialColor
=
new
THREE
.
Color
();
...
...
examples/webgl_loader_ctm_materials.html
浏览文件 @
0f5e69ce
...
...
@@ -109,12 +109,13 @@
sceneCube
.
add
(
cameraCube
);
var
r
=
"
textures/cube/pisa/
"
;
var
urls
=
[
r
+
"
px.png
"
,
r
+
"
nx.png
"
,
r
+
"
py.png
"
,
r
+
"
ny.png
"
,
r
+
"
pz.png
"
,
r
+
"
nz.png
"
];
var
urls
=
[
r
+
"
px.png
"
,
r
+
"
nx.png
"
,
r
+
"
py.png
"
,
r
+
"
ny.png
"
,
r
+
"
pz.png
"
,
r
+
"
nz.png
"
];
textureCube
=
THREE
.
ImageUtils
.
loadTextureCube
(
urls
);
textureCube
=
new
THREE
.
CubeTextureLoader
().
load
(
urls
);
var
shader
=
THREE
.
ShaderLib
[
"
cube
"
];
shader
.
uniforms
[
"
tCube
"
].
value
=
textureCube
;
...
...
examples/webgl_loader_utf8.html
浏览文件 @
0f5e69ce
...
...
@@ -84,7 +84,7 @@
path
+
'
pz
'
+
format
,
path
+
'
nz
'
+
format
];
reflectionCube
=
THREE
.
ImageUtils
.
loadTextureCube
(
urls
);
reflectionCube
=
new
THREE
.
CubeTextureLoader
().
load
(
urls
);
// LIGHTS
...
...
examples/webgl_marchingcubes.html
浏览文件 @
0f5e69ce
...
...
@@ -261,10 +261,10 @@
path
+
'
pz
'
+
format
,
path
+
'
nz
'
+
format
];
var
reflectionCube
=
THREE
.
ImageUtils
.
loadTextureCube
(
urls
);
var
reflectionCube
=
new
THREE
.
CubeTextureLoader
().
load
(
urls
);
reflectionCube
.
format
=
THREE
.
RGBFormat
;
var
refractionCube
=
THREE
.
ImageUtils
.
loadTextureCube
(
urls
);
var
refractionCube
=
new
THREE
.
CubeTextureLoader
().
load
(
urls
);
reflectionCube
.
format
=
THREE
.
RGBFormat
;
refractionCube
.
mapping
=
THREE
.
CubeRefractionMapping
;
...
...
examples/webgl_materials_cars.html
浏览文件 @
0f5e69ce
...
...
@@ -229,11 +229,13 @@
document
.
addEventListener
(
'
mousemove
'
,
onDocumentMouseMove
,
false
);
var
r
=
"
textures/cube/Bridge2/
"
;
var
urls
=
[
r
+
"
posx.jpg
"
,
r
+
"
negx.jpg
"
,
r
+
"
posy.jpg
"
,
r
+
"
negy.jpg
"
,
r
+
"
posz.jpg
"
,
r
+
"
negz.jpg
"
];
var
urls
=
[
r
+
"
posx.jpg
"
,
r
+
"
negx.jpg
"
,
r
+
"
posy.jpg
"
,
r
+
"
negy.jpg
"
,
r
+
"
posz.jpg
"
,
r
+
"
negz.jpg
"
];
var
textureCube
=
THREE
.
ImageUtils
.
loadTextureCube
(
urls
);
var
textureCube
=
new
THREE
.
CubeTextureLoader
().
load
(
urls
);
textureCube
.
format
=
THREE
.
RGBFormat
;
// common materials
...
...
examples/webgl_materials_cubemap.html
浏览文件 @
0f5e69ce
...
...
@@ -105,10 +105,10 @@
path
+
'
pz
'
+
format
,
path
+
'
nz
'
+
format
];
var
reflectionCube
=
THREE
.
ImageUtils
.
loadTextureCube
(
urls
);
var
reflectionCube
=
new
THREE
.
CubeTextureLoader
().
load
(
urls
);
reflectionCube
.
format
=
THREE
.
RGBFormat
;
var
refractionCube
=
THREE
.
ImageUtils
.
loadTextureCube
(
urls
);
var
refractionCube
=
new
THREE
.
CubeTextureLoader
().
load
(
urls
);
refractionCube
.
mapping
=
THREE
.
CubeRefractionMapping
;
refractionCube
.
format
=
THREE
.
RGBFormat
;
...
...
examples/webgl_materials_cubemap_balls_reflection.html
浏览文件 @
0f5e69ce
...
...
@@ -87,7 +87,7 @@
path
+
'
pz
'
+
format
,
path
+
'
nz
'
+
format
];
var
textureCube
=
THREE
.
ImageUtils
.
loadTextureCube
(
urls
);
var
textureCube
=
new
THREE
.
CubeTextureLoader
().
load
(
urls
);
var
material
=
new
THREE
.
MeshBasicMaterial
(
{
color
:
0xffffff
,
envMap
:
textureCube
}
);
for
(
var
i
=
0
;
i
<
500
;
i
++
)
{
...
...
examples/webgl_materials_cubemap_balls_refraction.html
浏览文件 @
0f5e69ce
...
...
@@ -86,7 +86,9 @@
path
+
'
pz
'
+
format
,
path
+
'
nz
'
+
format
];
var
textureCube
=
THREE
.
ImageUtils
.
loadTextureCube
(
urls
,
THREE
.
CubeRefractionMapping
);
var
textureCube
=
new
THREE
.
CubeTextureLoader
().
load
(
urls
);
textureCube
.
mapping
=
THREE
.
CubeRefractionMapping
;
var
material
=
new
THREE
.
MeshBasicMaterial
(
{
color
:
0xffffff
,
envMap
:
textureCube
,
refractionRatio
:
0.95
}
);
for
(
var
i
=
0
;
i
<
500
;
i
++
)
{
...
...
examples/webgl_materials_cubemap_escher.html
浏览文件 @
0f5e69ce
...
...
@@ -78,17 +78,19 @@
r + "py.jpg", r + "ny.jpg",
r + "pz.jpg", r + "nz.jpg" ];
var textureCube =
THREE.ImageUtils.loadTextureCube
( urls );
var textureCube =
new THREE.CubeTextureLoader().load
( urls );
*/
var
r
=
"
textures/cube/Escher/dds/
"
;
var
urls
=
[
r
+
"
px.dds
"
,
r
+
"
nx.dds
"
,
r
+
"
py.dds
"
,
r
+
"
ny.dds
"
,
r
+
"
pz.dds
"
,
r
+
"
nz.dds
"
];
var
urls
=
[
r
+
"
px.dds
"
,
r
+
"
nx.dds
"
,
r
+
"
py.dds
"
,
r
+
"
ny.dds
"
,
r
+
"
pz.dds
"
,
r
+
"
nz.dds
"
];
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_cubemap_refraction.html
浏览文件 @
0f5e69ce
...
...
@@ -99,11 +99,14 @@
var
r
=
"
textures/cube/Park3Med/
"
;
var
urls
=
[
r
+
"
px.jpg
"
,
r
+
"
nx.jpg
"
,
r
+
"
py.jpg
"
,
r
+
"
ny.jpg
"
,
r
+
"
pz.jpg
"
,
r
+
"
nz.jpg
"
];
var
textureCube
=
THREE
.
ImageUtils
.
loadTextureCube
(
urls
,
THREE
.
CubeRefractionMapping
);
var
urls
=
[
r
+
"
px.jpg
"
,
r
+
"
nx.jpg
"
,
r
+
"
py.jpg
"
,
r
+
"
ny.jpg
"
,
r
+
"
pz.jpg
"
,
r
+
"
nz.jpg
"
];
var
textureCube
=
new
THREE
.
CubeTextureLoader
().
load
(
urls
);
textureCube
.
mapping
=
THREE
.
CubeRefractionMapping
;
var
cubeMaterial3
=
new
THREE
.
MeshBasicMaterial
(
{
color
:
0xccddff
,
envMap
:
textureCube
,
refractionRatio
:
0.98
,
reflectivity
:
0.9
}
);
var
cubeMaterial2
=
new
THREE
.
MeshBasicMaterial
(
{
color
:
0xccfffd
,
envMap
:
textureCube
,
refractionRatio
:
0.985
}
);
...
...
examples/webgl_materials_displacementmap.html
浏览文件 @
0f5e69ce
...
...
@@ -134,7 +134,7 @@
path
+
'
pz
'
+
format
,
path
+
'
nz
'
+
format
];
var
reflectionCube
=
THREE
.
ImageUtils
.
loadTextureCube
(
urls
,
THREE
.
CubeReflectionMapping
);
var
reflectionCube
=
new
THREE
.
CubeTextureLoader
().
load
(
urls
);
// material
...
...
examples/webgl_materials_envmaps.html
浏览文件 @
0f5e69ce
...
...
@@ -24,7 +24,7 @@
</head>
<body>
<script
src=
"../build/three.min.js"
></script>
<script
src=
"js/controls/OrbitControls.js"
></script>
...
...
@@ -78,7 +78,7 @@
r
+
"
posy.jpg
"
,
r
+
"
negy.jpg
"
,
r
+
"
posz.jpg
"
,
r
+
"
negz.jpg
"
];
textureCube
=
THREE
.
ImageUtils
.
loadTextureCube
(
urls
);
textureCube
=
new
THREE
.
CubeTextureLoader
().
load
(
urls
);
textureCube
.
format
=
THREE
.
RGBFormat
;
textureCube
.
mapping
=
THREE
.
CubeReflectionMapping
;
...
...
examples/webgl_materials_shaders_fresnel.html
浏览文件 @
0f5e69ce
...
...
@@ -89,7 +89,7 @@
];
var
textureCube
=
THREE
.
ImageUtils
.
loadTextureCube
(
urls
);
var
textureCube
=
new
THREE
.
CubeTextureLoader
().
load
(
urls
);
textureCube
.
format
=
THREE
.
RGBFormat
;
var
shader
=
THREE
.
FresnelShader
;
...
...
examples/webgl_materials_variations_basic.html
浏览文件 @
0f5e69ce
...
...
@@ -80,7 +80,7 @@
path
+
'
pz
'
+
format
,
path
+
'
nz
'
+
format
];
var
reflectionCube
=
THREE
.
ImageUtils
.
loadTextureCube
(
urls
);
var
reflectionCube
=
new
THREE
.
CubeTextureLoader
().
load
(
urls
);
reflectionCube
.
format
=
THREE
.
RGBFormat
;
var
cubeWidth
=
400
;
...
...
examples/webgl_materials_variations_lambert.html
浏览文件 @
0f5e69ce
...
...
@@ -80,7 +80,7 @@
path
+
'
pz
'
+
format
,
path
+
'
nz
'
+
format
];
var
reflectionCube
=
THREE
.
ImageUtils
.
loadTextureCube
(
urls
);
var
reflectionCube
=
new
THREE
.
CubeTextureLoader
().
load
(
urls
);
reflectionCube
.
format
=
THREE
.
RGBFormat
;
var
cubeWidth
=
400
;
...
...
examples/webgl_materials_variations_phong.html
浏览文件 @
0f5e69ce
...
...
@@ -81,7 +81,7 @@
path
+
'
pz
'
+
format
,
path
+
'
nz
'
+
format
];
var
reflectionCube
=
THREE
.
ImageUtils
.
loadTextureCube
(
urls
);
var
reflectionCube
=
new
THREE
.
CubeTextureLoader
().
load
(
urls
);
reflectionCube
.
format
=
THREE
.
RGBFormat
;
var
cubeWidth
=
400
;
...
...
examples/webgl_materials_variations_standard.html
浏览文件 @
0f5e69ce
...
...
@@ -80,7 +80,7 @@
path
+
'
pz
'
+
format
,
path
+
'
nz
'
+
format
];
var
reflectionCube
=
THREE
.
ImageUtils
.
loadTextureCube
(
urls
);
var
reflectionCube
=
new
THREE
.
CubeTextureLoader
().
load
(
urls
);
reflectionCube
.
format
=
THREE
.
RGBFormat
;
var
cubeWidth
=
400
;
...
...
examples/webgl_materials_variations_standard2.html
浏览文件 @
0f5e69ce
...
...
@@ -80,7 +80,7 @@
path
+
'
pz
'
+
format
,
path
+
'
nz
'
+
format
];
var
reflectionCube
=
THREE
.
ImageUtils
.
loadTextureCube
(
urls
);
var
reflectionCube
=
new
THREE
.
CubeTextureLoader
().
load
(
urls
);
reflectionCube
.
format
=
THREE
.
RGBFormat
;
var
cubeWidth
=
400
;
...
...
examples/webgl_performance_doublesided.html
浏览文件 @
0f5e69ce
...
...
@@ -80,7 +80,7 @@
path
+
'
pz
'
+
format
,
path
+
'
nz
'
+
format
];
var
reflectionCube
=
THREE
.
ImageUtils
.
loadTextureCube
(
urls
);
var
reflectionCube
=
new
THREE
.
CubeTextureLoader
().
load
(
urls
);
reflectionCube
.
format
=
THREE
.
RGBFormat
;
var
material
=
new
THREE
.
MeshPhongMaterial
(
{
specular
:
0x101010
,
shininess
:
100
,
envMap
:
reflectionCube
,
combine
:
THREE
.
MixOperation
,
reflectivity
:
0.1
,
side
:
THREE
.
DoubleSide
}
);
...
...
examples/webgl_shaders_tonemapping.html
浏览文件 @
0f5e69ce
...
...
@@ -320,7 +320,7 @@
r
+
"
dark-s_py.jpg
"
,
r
+
"
dark-s_ny.jpg
"
,
r
+
"
dark-s_pz.jpg
"
,
r
+
"
dark-s_nz.jpg
"
];
var
textureCube
=
THREE
.
ImageUtils
.
loadTextureCube
(
urls
);
var
textureCube
=
new
THREE
.
CubeTextureLoader
().
load
(
urls
);
textureCube
.
format
=
THREE
.
RGBFormat
;
var
skyboxShader
=
THREE
.
ShaderLib
[
"
cube
"
];
skyboxShader
.
uniforms
[
"
tCube
"
].
value
=
textureCube
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录