|
24 | 24 | "description": "Import/export 3D model(s), animation(s) and texture(s) for the games based on Sith game engine",
|
25 | 25 | "author": "Crt Vavros",
|
26 | 26 | "version": (1, 0, 0),
|
27 |
| - "pre_release": "rc1", |
28 |
| - "warning": "Pre-release RC1", |
| 27 | + "pre_release": "rc2", |
| 28 | + "warning": "Pre-release RC2", |
29 | 29 | "blender": (2, 79, 0),
|
30 | 30 | "location": "File > Import-Export",
|
31 | 31 | "wiki_url": "https://github.com/smlu/blender-sith",
|
|
67 | 67 |
|
68 | 68 | from sith.model import (
|
69 | 69 | export3do,
|
70 |
| - import3do, |
71 |
| - FaceType, |
72 |
| - GeometryMode, |
73 |
| - LightMode, |
74 |
| - TextureMode |
| 70 | + import3do, |
| 71 | + FaceType, |
| 72 | + GeometryMode, |
| 73 | + LightMode, |
| 74 | + TextureMode |
75 | 75 | )
|
76 | 76 |
|
77 | 77 | from sith.model.model3doLoader import Model3doFileVersion
|
@@ -113,7 +113,7 @@ def _get_mesh3do_face_type_list():
|
113 | 113 | (FaceType.TexClamp_x.name , 'Clamp Horizontal' , "Polygon texture is clamped horizontally instead of repeated (Might not be used in JKDF2 & MOTS)" ),
|
114 | 114 | (FaceType.TexClamp_y.name , 'Clamp Vertical' , "Polygon texture is clamped vertically instead of repeated (Might not be used in JKDF2 & MOTS)" ),
|
115 | 115 | (FaceType.TexFilterNone.name , 'Disable Bilinear Filtering', "Disables texture bilinear interpolation filtering and instead point filtering is used as a texture magnification or minification filter" ),
|
116 |
| - (FaceType.ZWriteDisabled.name, 'Disable ZWrite' , "Disables writting polygon face to depth buffer" ), |
| 116 | + (FaceType.ZWriteDisabled.name, 'Disable ZWrite' , "Disables writing polygon face to depth buffer" ), |
117 | 117 | (FaceType.IjimLedge.name , '(IJIM) Ledge' , "(IJIM only) Polygon face is a ledge that player can grab and hang from" ),
|
118 | 118 | (FaceType.IjimFogEnabled.name, '(IJIM) Enable Fog' , "(IJIM only) Enables fog rendering for polygon face. Enabled by default by the engine" ),
|
119 | 119 | (FaceType.IjimWhipAim.name , '(IJIM) Whip Aim' , "(IJIM only) Polygon face is the start point for player to aim at object with whip" )
|
@@ -343,7 +343,7 @@ class ExportModel3do(bpy.types.Operator, ExportHelper):
|
343 | 343 | description = "3DO file version",
|
344 | 344 | items = [
|
345 | 345 | (Model3doFileVersion.Version2_1.name, '2.1 - JKDF2 & MOTS', 'Star Wars Jedi Knight: Dark Forces II & Star Wars Jedi Knight: Mysteries of the Sith'),
|
346 |
| - (Model3doFileVersion.Version2_2.name, '2.2 - IJIM (RGB)' , 'Indiana Jones and the Infernal Machine - RGB color'), |
| 346 | + (Model3doFileVersion.Version2_2.name, '2.2 - IJIM (RGB)' , 'Indiana Jones and the Infernal Machine - RGB color' ), |
347 | 347 | (Model3doFileVersion.Version2_3.name, '2.3 - IJIM' , 'Indiana Jones and the Infernal Machine - RGBA color')
|
348 | 348 | ],
|
349 | 349 | default= Model3doFileVersion.Version2_3.name
|
@@ -450,7 +450,7 @@ def _get_fps_enum_list():
|
450 | 450 | )
|
451 | 451 |
|
452 | 452 | fps = bpy.props.EnumProperty(
|
453 |
| - name = "Frame rate", |
| 453 | + name = 'Frame rate', |
454 | 454 | items = _get_fps_enum_list()
|
455 | 455 | )
|
456 | 456 |
|
@@ -481,18 +481,17 @@ def invoke(self, context, event):
|
481 | 481 | self.obj = _get_export_obj(context, self.report, 'animation')
|
482 | 482 | if self.obj is None:
|
483 | 483 | return {'CANCELLED'}
|
484 |
| - kfname = bpy.path.display_name_from_filepath(self.obj.name ) |
| 484 | + kfname = bpy.path.display_name_from_filepath(self.obj.name ) |
485 | 485 | self.filepath = bpy.path.ensure_ext(kfname, self.filename_ext)
|
486 | 486 | return ExportHelper.invoke(self, context, event)
|
487 | 487 |
|
488 | 488 | def execute(self, context):
|
| 489 | + context.scene.key_animation_flags = self.animation_flags |
| 490 | + context.scene.key_node_types = self.node_types |
| 491 | + context.scene.render.fps = float(self.fps) |
489 | 492 | scene = context.scene.copy()
|
490 | 493 | try:
|
491 |
| - scene.key_animation_flags = self.animation_flags |
492 |
| - scene.key_animation_type = self.animation_type |
493 |
| - scene.render.fps = float(self.fps) |
494 | 494 | exportKey(self.obj, scene, self.filepath)
|
495 |
| - |
496 | 495 | self.report({'INFO'}, "KEY '{}' was successfully exported".format(os.path.basename(self.filepath)))
|
497 | 496 | return {'FINISHED'}
|
498 | 497 | except (AssertionError, ValueError) as e:
|
@@ -541,8 +540,8 @@ def draw(self, context):
|
541 | 540 |
|
542 | 541 | class Mesh3doFaceLayer(bpy.types.PropertyGroup):
|
543 | 542 | """
|
544 |
| - Intermediant class for temporary storing BMFace properties by Mesh3doFacePanel |
545 |
| - and used it to disply stored properties to the UI. |
| 543 | + Intermediate class for temporary storing BMFace properties by Mesh3doFacePanel |
| 544 | + and used it to display stored properties to the UI. |
546 | 545 | """
|
547 | 546 | face_id = bpy.props.IntProperty(default = -1)
|
548 | 547 |
|
|
0 commit comments