[Bf-extensions-cvs] [bfbabc0] master: Use new IOHelperOrientation class to handle forward/up axes.
Bastien Montagne
noreply at git.blender.org
Wed Jan 14 13:10:12 CET 2015
Commit: bfbabc0592b820ec948fa355805ed78a882f4943
Author: Bastien Montagne
Date: Wed Jan 14 13:08:57 2015 +0100
Branches: master
https://developer.blender.org/rBAbfbabc0592b820ec948fa355805ed78a882f4943
Use new IOHelperOrientation class to handle forward/up axes.
Helps ensuring common behavior, and saves quite a few lines of code, too...
===================================================================
M io_anim_bvh/__init__.py
M io_mesh_ply/__init__.py
M io_mesh_stl/__init__.py
M io_scene_3ds/__init__.py
M io_scene_fbx/__init__.py
M io_scene_obj/__init__.py
M io_scene_vrml2/__init__.py
M io_scene_x3d/__init__.py
===================================================================
diff --git a/io_anim_bvh/__init__.py b/io_anim_bvh/__init__.py
index a4a42a9..9ad366e 100644
--- a/io_anim_bvh/__init__.py
+++ b/io_anim_bvh/__init__.py
@@ -21,7 +21,7 @@
bl_info = {
"name": "BioVision Motion Capture (BVH) format",
"author": "Campbell Barton",
- "blender": (2, 57, 0),
+ "blender": (2, 73, 0),
"location": "File > Import-Export",
"description": "Import-Export BVH from armature objects",
"warning": "",
@@ -46,11 +46,12 @@ from bpy.props import (StringProperty,
)
from bpy_extras.io_utils import (ImportHelper,
ExportHelper,
+ IOHelperOrientation,
axis_conversion,
)
-class ImportBVH(bpy.types.Operator, ImportHelper):
+class ImportBVH(bpy.types.Operator, ImportHelper, IOHelperOrientation):
"""Load a BVH motion capture file"""
bl_idname = "import_anim.bvh"
bl_label = "Import BVH"
@@ -108,30 +109,6 @@ class ImportBVH(bpy.types.Operator, ImportHelper):
default='NATIVE',
)
- axis_forward = EnumProperty(
- name="Forward",
- items=(('X', "X Forward", ""),
- ('Y', "Y Forward", ""),
- ('Z', "Z Forward", ""),
- ('-X', "-X Forward", ""),
- ('-Y', "-Y Forward", ""),
- ('-Z', "-Z Forward", ""),
- ),
- default='-Z',
- )
-
- axis_up = EnumProperty(
- name="Up",
- items=(('X', "X Up", ""),
- ('Y', "Y Up", ""),
- ('Z', "Z Up", ""),
- ('-X', "-X Up", ""),
- ('-Y', "-Y Up", ""),
- ('-Z', "-Z Up", ""),
- ),
- default='Y',
- )
-
def execute(self, context):
keywords = self.as_keywords(ignore=("axis_forward",
"axis_up",
diff --git a/io_mesh_ply/__init__.py b/io_mesh_ply/__init__.py
index f085482..887c354 100644
--- a/io_mesh_ply/__init__.py
+++ b/io_mesh_ply/__init__.py
@@ -21,7 +21,7 @@
bl_info = {
"name": "Stanford PLY format",
"author": "Bruce Merry, Campbell Barton",
- "blender": (2, 57, 0),
+ "blender": (2, 73, 0),
"location": "File > Import-Export",
"description": "Import-Export PLY mesh data withs UV's and vertex colors",
"warning": "",
@@ -53,6 +53,7 @@ from bpy.props import (CollectionProperty,
)
from bpy_extras.io_utils import (ImportHelper,
ExportHelper,
+ IOHelperOrientation,
axis_conversion,
)
@@ -87,7 +88,7 @@ class ImportPLY(bpy.types.Operator, ImportHelper):
return {'FINISHED'}
-class ExportPLY(bpy.types.Operator, ExportHelper):
+class ExportPLY(bpy.types.Operator, ExportHelper, IOHelperOrientation):
"""Export a single object as a Stanford PLY with normals, """ \
"""colors and texture coordinates"""
bl_idname = "export_mesh.ply"
@@ -120,28 +121,6 @@ class ExportPLY(bpy.types.Operator, ExportHelper):
default=True,
)
- axis_forward = EnumProperty(
- name="Forward",
- items=(('X', "X Forward", ""),
- ('Y', "Y Forward", ""),
- ('Z', "Z Forward", ""),
- ('-X', "-X Forward", ""),
- ('-Y', "-Y Forward", ""),
- ('-Z', "-Z Forward", ""),
- ),
- default='Y',
- )
- axis_up = EnumProperty(
- name="Up",
- items=(('X', "X Up", ""),
- ('Y', "Y Up", ""),
- ('Z', "Z Up", ""),
- ('-X', "-X Up", ""),
- ('-Y', "-Y Up", ""),
- ('-Z', "-Z Up", ""),
- ),
- default='Z',
- )
global_scale = FloatProperty(
name="Scale",
min=0.01, max=1000.0,
diff --git a/io_mesh_stl/__init__.py b/io_mesh_stl/__init__.py
index 785bfb3..884fc11 100644
--- a/io_mesh_stl/__init__.py
+++ b/io_mesh_stl/__init__.py
@@ -21,8 +21,8 @@
bl_info = {
"name": "STL format",
"author": "Guillaume Bouchard (Guillaum)",
- "version": (1, 0),
- "blender": (2, 57, 0),
+ "version": (1, 1),
+ "blender": (2, 73, 0),
"location": "File > Import-Export > Stl",
"description": "Import-Export STL files",
"warning": "",
@@ -65,12 +65,13 @@ from bpy.props import (StringProperty,
)
from bpy_extras.io_utils import (ImportHelper,
ExportHelper,
+ IOHelperOrientation,
axis_conversion,
)
from bpy.types import Operator, OperatorFileListElement
-class ImportSTL(Operator, ImportHelper):
+class ImportSTL(Operator, ImportHelper, IOHelperOrientation):
"""Load STL triangle mesh data"""
bl_idname = "import_mesh.stl"
bl_label = "Import STL"
@@ -90,28 +91,6 @@ class ImportSTL(Operator, ImportHelper):
subtype='DIR_PATH',
)
- axis_forward = EnumProperty(
- name="Forward",
- items=(('X', "X Forward", ""),
- ('Y', "Y Forward", ""),
- ('Z', "Z Forward", ""),
- ('-X', "-X Forward", ""),
- ('-Y', "-Y Forward", ""),
- ('-Z', "-Z Forward", ""),
- ),
- default='Y',
- )
- axis_up = EnumProperty(
- name="Up",
- items=(('X', "X Up", ""),
- ('Y', "Y Up", ""),
- ('Z', "Z Up", ""),
- ('-X', "-X Up", ""),
- ('-Y', "-Y Up", ""),
- ('-Z', "-Z Up", ""),
- ),
- default='Z',
- )
global_scale = FloatProperty(
name="Scale",
min=0.01, max=1000.0,
@@ -160,7 +139,7 @@ class ImportSTL(Operator, ImportHelper):
return {'FINISHED'}
-class ExportSTL(Operator, ExportHelper):
+class ExportSTL(Operator, ExportHelper, IOHelperOrientation):
"""Save STL triangle mesh data from the active object"""
bl_idname = "export_mesh.stl"
bl_label = "Export STL"
@@ -168,28 +147,6 @@ class ExportSTL(Operator, ExportHelper):
filename_ext = ".stl"
filter_glob = StringProperty(default="*.stl", options={'HIDDEN'})
- axis_forward = EnumProperty(
- name="Forward",
- items=(('X', "X Forward", ""),
- ('Y', "Y Forward", ""),
- ('Z', "Z Forward", ""),
- ('-X', "-X Forward", ""),
- ('-Y', "-Y Forward", ""),
- ('-Z', "-Z Forward", ""),
- ),
- default='Y',
- )
- axis_up = EnumProperty(
- name="Up",
- items=(('X', "X Up", ""),
- ('Y', "Y Up", ""),
- ('Z', "Z Up", ""),
- ('-X', "-X Up", ""),
- ('-Y', "-Y Up", ""),
- ('-Z', "-Z Up", ""),
- ),
- default='Z',
- )
global_scale = FloatProperty(
name="Scale",
min=0.01, max=1000.0,
diff --git a/io_scene_3ds/__init__.py b/io_scene_3ds/__init__.py
index 4311b28..85f3bfb 100644
--- a/io_scene_3ds/__init__.py
+++ b/io_scene_3ds/__init__.py
@@ -21,7 +21,7 @@
bl_info = {
"name": "Autodesk 3DS format",
"author": "Bob Holcomb, Campbell Barton",
- "blender": (2, 57, 0),
+ "blender": (2, 73, 0),
"location": "File > Import-Export",
"description": "Import-Export 3DS, meshes, uvs, materials, textures, "
"cameras & lamps",
@@ -44,11 +44,12 @@ from bpy.props import StringProperty, FloatProperty, BoolProperty, EnumProperty
from bpy_extras.io_utils import (ImportHelper,
ExportHelper,
+ IOHelperOrientation,
axis_conversion,
)
-class Import3DS(bpy.types.Operator, ImportHelper):
+class Import3DS(bpy.types.Operator, ImportHelper, IOHelperOrientation):
"""Import from 3DS file format (.3ds)"""
bl_idname = "import_scene.autodesk_3ds"
bl_label = 'Import 3DS'
@@ -78,30 +79,6 @@ class Import3DS(bpy.types.Operator, ImportHelper):
default=True,
)
- axis_forward = EnumProperty(
- name="Forward",
- items=(('X', "X Forward", ""),
- ('Y', "Y Forward", ""),
- ('Z', "Z Forward", ""),
- ('-X', "-X Forward", ""),
- ('-Y', "-Y Forward", ""),
- ('-Z', "-Z Forward", ""),
- ),
- default='Y',
- )
-
- axis_up = EnumProperty(
- name="Up",
- items=(('X', "X Up", ""),
- ('Y', "Y Up", ""),
- ('Z', "Z Up", ""),
- ('-X', "-X Up", ""),
- ('-Y', "-Y Up", ""),
- ('-Z', "-Z Up", ""),
- ),
- default='Z',
- )
-
def execute(self, context):
from . import import_3ds
@@ -118,7 +95,7 @@ class Import3DS(bpy.types.Operator, ImportHelper):
return import_3ds.load(self, context, **keywords)
-class Export3DS(bpy.types.Operator, ExportHelper):
+class Export3DS(bpy.types.Operator, ExportHelper, IOHelperOrientation):
"""Export to 3DS file format (.3ds)"""
bl_idname = "export_scene.autodesk_3ds"
bl_label = 'Export 3DS'
@@ -135,30 +112,6 @@ class Export3DS(bpy.types.Operator, ExportHelper):
default=False,
)
- axis_forward = EnumProperty(
- name="Forward",
- items=(('X', "X Forward", ""),
- ('Y', "Y Forward", ""),
- ('Z', "Z Forward", ""),
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list