Merge pull request #11211 from alcornwill/fix_blender_exporter_tests

Fix blender exporter tests

utils/exporters/blender/addons/io_three/exporter/scene.py

@@ -142,22 +142,14 @@ class Scene(base_classes.BaseScene):
                         geom.write_animation(export_dir)
 
                     geom_data = geom.copy()
-                    if embed:
-                        geometries.append(geom_data)
-                        continue
-
-                    geo_type = geom_data[constants.TYPE].lower()
-                    if geo_type == constants.GEOMETRY.lower():
+                    if not embed:
                         geom_data.pop(constants.DATA)
-                    elif geo_type == constants.BUFFER_GEOMETRY.lower():
-                        geom_data.pop(constants.ATTRIBUTES)
-                        geom_data.pop(constants.METADATA)
 
-                    url = 'geometry.%s%s' % (geom.node, extension)
-                    geometry_file = os.path.join(export_dir, url)
+                        url = 'geometry.%s%s' % (geom.node, extension)
+                        geometry_file = os.path.join(export_dir, url)
 
-                    geom.write(filepath=geometry_file)
-                    geom_data[constants.URL] = os.path.basename(url)
+                        geom.write(filepath=geometry_file)
+                        geom_data[constants.URL] = os.path.basename(url)
 
                     geometries.append(geom_data)
 

utils/exporters/blender/tests/scripts/js/review.js

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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)