Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
车家大少爷
three.js
提交
16b938bd
T
three.js
项目概览
车家大少爷
/
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,发现更多精彩内容 >>
提交
16b938bd
编写于
4月 21, 2017
作者:
W
Will Alcorn
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix some blender exporter tests
上级
da01dc47
变更
27
隐藏空白更改
内联
并排
Showing
27 changed file
with
28 addition
and
30 deletion
+28
-30
utils/exporters/blender/addons/io_three/exporter/scene.py
utils/exporters/blender/addons/io_three/exporter/scene.py
+1
-2
utils/exporters/blender/tests/scripts/js/review.js
utils/exporters/blender/tests/scripts/js/review.js
+2
-3
utils/exporters/blender/tests/scripts/test_geometry.bash
utils/exporters/blender/tests/scripts/test_geometry.bash
+1
-1
utils/exporters/blender/tests/scripts/test_geometry_animation.bash
...orters/blender/tests/scripts/test_geometry_animation.bash
+1
-1
utils/exporters/blender/tests/scripts/test_geometry_bump_spec_maps.bash
...s/blender/tests/scripts/test_geometry_bump_spec_maps.bash
+1
-1
utils/exporters/blender/tests/scripts/test_geometry_diffuse_map.bash
...ters/blender/tests/scripts/test_geometry_diffuse_map.bash
+1
-1
utils/exporters/blender/tests/scripts/test_geometry_influences.bash
...rters/blender/tests/scripts/test_geometry_influences.bash
+1
-1
utils/exporters/blender/tests/scripts/test_geometry_lambert_material.bash
...blender/tests/scripts/test_geometry_lambert_material.bash
+1
-1
utils/exporters/blender/tests/scripts/test_geometry_light_map.bash
...orters/blender/tests/scripts/test_geometry_light_map.bash
+1
-1
utils/exporters/blender/tests/scripts/test_geometry_mix_colors.bash
...rters/blender/tests/scripts/test_geometry_mix_colors.bash
+1
-1
utils/exporters/blender/tests/scripts/test_geometry_morph_targets.bash
...rs/blender/tests/scripts/test_geometry_morph_targets.bash
+1
-1
utils/exporters/blender/tests/scripts/test_geometry_normal_map.bash
...rters/blender/tests/scripts/test_geometry_normal_map.bash
+1
-1
utils/exporters/blender/tests/scripts/test_geometry_normals.bash
...xporters/blender/tests/scripts/test_geometry_normals.bash
+1
-1
utils/exporters/blender/tests/scripts/test_geometry_phong_material.bash
...s/blender/tests/scripts/test_geometry_phong_material.bash
+1
-1
utils/exporters/blender/tests/scripts/test_geometry_vertex_colors.bash
...rs/blender/tests/scripts/test_geometry_vertex_colors.bash
+1
-1
utils/exporters/blender/tests/scripts/test_geometry_wireframe.bash
...orters/blender/tests/scripts/test_geometry_wireframe.bash
+1
-1
utils/exporters/blender/tests/scripts/test_scene_area_light.bash
...xporters/blender/tests/scripts/test_scene_area_light.bash
+1
-1
utils/exporters/blender/tests/scripts/test_scene_children.bash
.../exporters/blender/tests/scripts/test_scene_children.bash
+1
-1
utils/exporters/blender/tests/scripts/test_scene_directional_light.bash
...s/blender/tests/scripts/test_scene_directional_light.bash
+1
-1
utils/exporters/blender/tests/scripts/test_scene_hemi_light.bash
...xporters/blender/tests/scripts/test_scene_hemi_light.bash
+1
-1
utils/exporters/blender/tests/scripts/test_scene_instancing.bash
...xporters/blender/tests/scripts/test_scene_instancing.bash
+1
-1
utils/exporters/blender/tests/scripts/test_scene_maps.bash
utils/exporters/blender/tests/scripts/test_scene_maps.bash
+1
-1
utils/exporters/blender/tests/scripts/test_scene_no_embed.bash
.../exporters/blender/tests/scripts/test_scene_no_embed.bash
+1
-1
utils/exporters/blender/tests/scripts/test_scene_orthographic.bash
...orters/blender/tests/scripts/test_scene_orthographic.bash
+1
-1
utils/exporters/blender/tests/scripts/test_scene_perspective.bash
...porters/blender/tests/scripts/test_scene_perspective.bash
+1
-1
utils/exporters/blender/tests/scripts/test_scene_point_light.bash
...porters/blender/tests/scripts/test_scene_point_light.bash
+1
-1
utils/exporters/blender/tests/scripts/test_scene_spot_light.bash
...xporters/blender/tests/scripts/test_scene_spot_light.bash
+1
-1
未找到文件。
utils/exporters/blender/addons/io_three/exporter/scene.py
浏览文件 @
16b938bd
...
...
@@ -150,8 +150,7 @@ class Scene(base_classes.BaseScene):
if
geo_type
==
constants
.
GEOMETRY
.
lower
():
geom_data
.
pop
(
constants
.
DATA
)
elif
geo_type
==
constants
.
BUFFER_GEOMETRY
.
lower
():
geom_data
.
pop
(
constants
.
ATTRIBUTES
)
geom_data
.
pop
(
constants
.
METADATA
)
geom_data
.
pop
(
constants
.
DATA
)
url
=
'geometry.%s%s'
%
(
geom
.
node
,
extension
)
geometry_file
=
os
.
path
.
join
(
export_dir
,
url
)
...
...
utils/exporters/blender/tests/scripts/js/review.js
浏览文件 @
16b938bd
...
...
@@ -133,21 +133,20 @@ function loadGeometry( data, url ) {
}
var
material
=
new
THREE
.
MultiMaterial
(
data
.
materials
);
var
mesh
;
if
(
data
.
geometry
.
animations
!==
undefined
&&
data
.
geometry
.
animations
.
length
>
0
)
{
console
.
log
(
'
loading animation
'
);
data
.
materials
[
0
].
skinning
=
true
;
mesh
=
new
THREE
.
SkinnedMesh
(
data
.
geometry
,
material
,
false
);
mesh
=
new
THREE
.
SkinnedMesh
(
data
.
geometry
,
data
.
materials
,
false
);
mixer
=
new
THREE
.
AnimationMixer
(
mesh
);
animation
=
mixer
.
clipAction
(
mesh
.
geometry
.
animations
[
0
]
);
}
else
{
mesh
=
new
THREE
.
Mesh
(
data
.
geometry
,
material
);
mesh
=
new
THREE
.
Mesh
(
data
.
geometry
,
data
.
materials
);
if
(
data
.
geometry
.
morphTargets
.
length
>
0
)
{
...
...
utils/exporters/blender/tests/scripts/test_geometry.bash
浏览文件 @
16b938bd
...
...
@@ -4,5 +4,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source
"
$DIR
/setup_test_env.bash"
blender
--background
$BLEND
/cubeA.blend
--python
$PYSCRIPT
--
\
$JSON
--vertices
--faces
$JSON
--vertices
--faces
--geometryType
Geometry
makereview
$@
--tag
$(
tagname
)
utils/exporters/blender/tests/scripts/test_geometry_animation.bash
浏览文件 @
16b938bd
...
...
@@ -5,5 +5,5 @@ source "$DIR/setup_test_env.bash"
blender
--background
$BLEND
/anim.blend
--python
$PYSCRIPT
--
\
$JSON
--vertices
--faces
--animation
rest
--bones
--skinning
\
--embedAnimation
--embedAnimation
--geometryType
Geometry
makereview
$@
--tag
$(
tagname
)
utils/exporters/blender/tests/scripts/test_geometry_bump_spec_maps.bash
浏览文件 @
16b938bd
...
...
@@ -4,5 +4,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source
"
$DIR
/setup_test_env.bash"
blender
--background
$BLEND
/planeA.blend
--python
$PYSCRIPT
--
\
$JSON
--vertices
--faces
--faceMaterials
--uvs
--maps
--
copyTextures
$JSON
--vertices
--faces
--faceMaterials
--uvs
--maps
--
exportTextures
--geometryType
Geometry
makereview
$@
--tag
$(
tagname
)
utils/exporters/blender/tests/scripts/test_geometry_diffuse_map.bash
浏览文件 @
16b938bd
...
...
@@ -4,5 +4,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source
"
$DIR
/setup_test_env.bash"
blender
--background
$BLEND
/cubeA.blend
--python
$PYSCRIPT
--
\
$JSON
--vertices
--faces
--faceMaterials
--uvs
--maps
--
copyTextures
$JSON
--vertices
--faces
--faceMaterials
--uvs
--maps
--
exportTextures
--geometryType
Geometry
makereview
$@
--tag
$(
tagname
)
utils/exporters/blender/tests/scripts/test_geometry_influences.bash
浏览文件 @
16b938bd
...
...
@@ -5,5 +5,5 @@ source "$DIR/setup_test_env.bash"
blender
--background
$BLEND
/anim.blend
--python
$PYSCRIPT
--
\
$JSON
--vertices
--faces
--animation
--bones
--skinning
\
--embedAnimation
--influencesPerVertex
4
--embedAnimation
--influencesPerVertex
4
--geometryType
Geometry
makereview
$@
--tag
$(
tagname
)
utils/exporters/blender/tests/scripts/test_geometry_lambert_material.bash
浏览文件 @
16b938bd
...
...
@@ -4,5 +4,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source
"
$DIR
/setup_test_env.bash"
blender
--background
$BLEND
/cubeA.blend
--python
$PYSCRIPT
--
\
$JSON
--vertices
--faces
--faceMaterials
$JSON
--vertices
--faces
--faceMaterials
--geometryType
Geometry
makereview
$@
--tag
$(
tagname
)
utils/exporters/blender/tests/scripts/test_geometry_light_map.bash
浏览文件 @
16b938bd
...
...
@@ -4,5 +4,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source
"
$DIR
/setup_test_env.bash"
blender
--background
$BLEND
/lightmap.blend
--python
$PYSCRIPT
--
\
$JSON
--vertices
--faces
--faceMaterials
--uvs
--maps
--
copyTextures
$JSON
--vertices
--faces
--faceMaterials
--uvs
--maps
--
exportTextures
--geometryType
Geometry
makereview
$@
--tag
$(
tagname
)
utils/exporters/blender/tests/scripts/test_geometry_mix_colors.bash
浏览文件 @
16b938bd
...
...
@@ -4,5 +4,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source
"
$DIR
/setup_test_env.bash"
blender
--background
$BLEND
/cubeB.blend
--python
$PYSCRIPT
--
\
$JSON
--vertices
--faces
--colors
--faceMaterials
--mixColors
$JSON
--vertices
--faces
--colors
--faceMaterials
--mixColors
--geometryType
Geometry
makereview
$@
--tag
$(
tagname
)
utils/exporters/blender/tests/scripts/test_geometry_morph_targets.bash
浏览文件 @
16b938bd
...
...
@@ -4,5 +4,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source
"
$DIR
/setup_test_env.bash"
blender
--background
$BLEND
/anim.blend
--python
$PYSCRIPT
--
\
$JSON
--vertices
--faces
--morphTargets
--embedAnimation
$JSON
--vertices
--faces
--morphTargets
--embedAnimation
--geometryType
Geometry
makereview
$@
--tag
$(
tagname
)
utils/exporters/blender/tests/scripts/test_geometry_normal_map.bash
浏览文件 @
16b938bd
...
...
@@ -5,5 +5,5 @@ source "$DIR/setup_test_env.bash"
blender
--background
$BLEND
/planeB.blend
--python
$PYSCRIPT
--
\
$JSON
--vertices
--faces
--faceMaterials
--uvs
--maps
--normals
\
--
copyTextures
--
exportTextures
--geometryType
Geometry
makereview
$@
--tag
$(
tagname
)
utils/exporters/blender/tests/scripts/test_geometry_normals.bash
浏览文件 @
16b938bd
...
...
@@ -4,5 +4,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source
"
$DIR
/setup_test_env.bash"
blender
--background
$BLEND
/torusA.blend
--python
$PYSCRIPT
--
\
$JSON
--vertices
--faces
--normals
--indent
$JSON
--vertices
--faces
--normals
--indent
--geometryType
Geometry
makereview
$@
--tag
$(
tagname
)
utils/exporters/blender/tests/scripts/test_geometry_phong_material.bash
浏览文件 @
16b938bd
...
...
@@ -4,5 +4,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source
"
$DIR
/setup_test_env.bash"
blender
--background
$BLEND
/torusA.blend
--python
$PYSCRIPT
--
\
$JSON
--vertices
--faces
--normals
--faceMaterials
$JSON
--vertices
--faces
--normals
--faceMaterials
--geometryType
Geometry
makereview
$@
--tag
$(
tagname
)
utils/exporters/blender/tests/scripts/test_geometry_vertex_colors.bash
浏览文件 @
16b938bd
...
...
@@ -4,5 +4,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source
"
$DIR
/setup_test_env.bash"
blender
--background
$BLEND
/cubeB.blend
--python
$PYSCRIPT
--
\
$JSON
--vertices
--faces
--colors
--faceMaterials
$JSON
--vertices
--faces
--colors
--faceMaterials
--geometryType
Geometry
makereview
$@
--tag
$(
tagname
)
utils/exporters/blender/tests/scripts/test_geometry_wireframe.bash
浏览文件 @
16b938bd
...
...
@@ -4,5 +4,5 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source
"
$DIR
/setup_test_env.bash"
blender
--background
$BLEND
/cubeC.blend
--python
$PYSCRIPT
--
\
$JSON
--vertices
--faces
--faceMaterials
$JSON
--vertices
--faces
--faceMaterials
--geometryType
Geometry
makereview
$@
--tag
$(
tagname
)
utils/exporters/blender/tests/scripts/test_scene_area_light.bash
浏览文件 @
16b938bd
...
...
@@ -5,5 +5,5 @@ source "$DIR/setup_test_env.bash"
blender
--background
$BLEND
/scene_area_light.blend
\
--python
$PYSCRIPT
--
$JSON
--vertices
--faces
--scene
\
--lights
--materials
--embedGeometry
--lights
--materials
--embedGeometry
--geometryType
Geometry
makereview
$@
--tag
$(
tagname
)
utils/exporters/blender/tests/scripts/test_scene_children.bash
浏览文件 @
16b938bd
...
...
@@ -5,5 +5,5 @@ source "$DIR/setup_test_env.bash"
blender
--background
$BLEND
/scene_children.blend
\
--python
$PYSCRIPT
--
$JSON
--vertices
--faces
--scene
\
--cameras
--materials
--embedGeometry
--lights
--cameras
--cameras
--materials
--embedGeometry
--lights
--cameras
--geometryType
Geometry
makereview
$@
--tag
$(
tagname
)
utils/exporters/blender/tests/scripts/test_scene_directional_light.bash
浏览文件 @
16b938bd
...
...
@@ -5,5 +5,5 @@ source "$DIR/setup_test_env.bash"
blender
--background
$BLEND
/scene_directional_light.blend
\
--python
$PYSCRIPT
--
$JSON
--vertices
--faces
--scene
\
--lights
--materials
--embedGeometry
--lights
--materials
--embedGeometry
--geometryType
Geometry
makereview
$@
--tag
$(
tagname
)
utils/exporters/blender/tests/scripts/test_scene_hemi_light.bash
浏览文件 @
16b938bd
...
...
@@ -5,5 +5,5 @@ source "$DIR/setup_test_env.bash"
blender
--background
$BLEND
/scene_hemi_light.blend
\
--python
$PYSCRIPT
--
$JSON
--vertices
--faces
--scene
\
--lights
--materials
--embedGeometry
--lights
--materials
--embedGeometry
--geometryType
Geometry
makereview
$@
--tag
$(
tagname
)
utils/exporters/blender/tests/scripts/test_scene_instancing.bash
浏览文件 @
16b938bd
...
...
@@ -5,5 +5,5 @@ source "$DIR/setup_test_env.bash"
blender
--background
$BLEND
/scene_instancing.blend
--python
$PYSCRIPT
--
\
$JSON
--vertices
--faces
--scene
--materials
--enablePrecision
\
--precision
4
--embedGeometry
--indent
--precision
4
--embedGeometry
--indent
--geometryType
Geometry
makereview
$@
--tag
$(
tagname
)
utils/exporters/blender/tests/scripts/test_scene_maps.bash
浏览文件 @
16b938bd
...
...
@@ -5,5 +5,5 @@ source "$DIR/setup_test_env.bash"
blender
--background
$BLEND
/scene_maps.blend
--python
$PYSCRIPT
--
\
$JSON
--vertices
--faces
--scene
--materials
--maps
\
--uvs
--embedGeometry
--
copyTextures
--uvs
--embedGeometry
--
exportTextures
--geometryType
Geometry
makereview
$@
--tag
$(
tagname
)
utils/exporters/blender/tests/scripts/test_scene_no_embed.bash
浏览文件 @
16b938bd
...
...
@@ -5,5 +5,5 @@ source "$DIR/setup_test_env.bash"
blender
--background
$BLEND
/scene_instancing.blend
--python
$PYSCRIPT
--
\
$JSON
--vertices
--faces
--scene
--materials
--enablePrecision
\
--precision
4
--precision
4
--geometryType
Geometry
makereview
$@
--tag
$(
tagname
)
utils/exporters/blender/tests/scripts/test_scene_orthographic.bash
浏览文件 @
16b938bd
...
...
@@ -5,5 +5,5 @@ source "$DIR/setup_test_env.bash"
blender
--background
$BLEND
/scene_orthographic_camera.blend
\
--python
$PYSCRIPT
--
$JSON
--vertices
--faces
--scene
\
--cameras
--materials
--embedGeometry
--cameras
--materials
--embedGeometry
--geometryType
Geometry
makereview
$@
--tag
$(
tagname
)
utils/exporters/blender/tests/scripts/test_scene_perspective.bash
浏览文件 @
16b938bd
...
...
@@ -5,5 +5,5 @@ source "$DIR/setup_test_env.bash"
blender
--background
$BLEND
/scene_perspective_camera.blend
\
--python
$PYSCRIPT
--
$JSON
--vertices
--faces
--scene
\
--cameras
--materials
--embedGeometry
--cameras
--materials
--embedGeometry
--geometryType
Geometry
makereview
$@
--tag
$(
tagname
)
utils/exporters/blender/tests/scripts/test_scene_point_light.bash
浏览文件 @
16b938bd
...
...
@@ -5,5 +5,5 @@ source "$DIR/setup_test_env.bash"
blender
--background
$BLEND
/scene_point_light.blend
\
--python
$PYSCRIPT
--
$JSON
--vertices
--faces
--scene
\
--lights
--materials
--embedGeometry
--lights
--materials
--embedGeometry
--geometryType
Geometry
makereview
$@
--tag
$(
tagname
)
utils/exporters/blender/tests/scripts/test_scene_spot_light.bash
浏览文件 @
16b938bd
...
...
@@ -5,5 +5,5 @@ source "$DIR/setup_test_env.bash"
blender
--background
$BLEND
/scene_spot_light.blend
\
--python
$PYSCRIPT
--
$JSON
--vertices
--faces
--scene
\
--lights
--materials
--embedGeometry
--lights
--materials
--embedGeometry
--geometryType
Geometry
makereview
$@
--tag
$(
tagname
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录