diff --git a/addon/io_scs_tools/__init__.py b/addon/io_scs_tools/__init__.py index 2e3cb1d..6e74231 100644 --- a/addon/io_scs_tools/__init__.py +++ b/addon/io_scs_tools/__init__.py @@ -22,10 +22,10 @@ "name": "SCS Tools", "description": "Setup models, Import-Export SCS data format", "author": "Simon Lusenc (50keda), Milos Zajic (4museman)", - "version": (2, 3, "5277ea2d"), + "version": (2, 3, "aa16aece"), "blender": (3, 0, 0), "location": "File > Import-Export", - "wiki_url": "http://modding.scssoft.com/wiki/Documentation/Tools/SCS_Blender_Tools", + "doc_url": "http://modding.scssoft.com/wiki/Documentation/Tools/SCS_Blender_Tools", "tracker_url": "http://forum.scssoft.com/viewforum.php?f=163", "support": "COMMUNITY", "category": "Import-Export"} diff --git a/addon/io_scs_tools/imp/pia.py b/addon/io_scs_tools/imp/pia.py index 42e15c0..5adb334 100644 --- a/addon/io_scs_tools/imp/pia.py +++ b/addon/io_scs_tools/imp/pia.py @@ -415,8 +415,8 @@ def load(root_object, pia_files, armature, pis_filepath=None, bones=None): animation = _animation_utils.add_animation_to_root(root_object, animation_name) animation.export = True animation.action = anim_action.name - animation.anim_start = anim_action.frame_range[0] - animation.anim_end = anim_action.frame_range[1] + animation.anim_start = int(anim_action.frame_range[0]) + animation.anim_end = int(anim_action.frame_range[1]) if total_time: animation.length = total_time diff --git a/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/12_animated_cube.py b/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/12_animated_cube.py new file mode 100644 index 0000000..cc99986 --- /dev/null +++ b/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/12_animated_cube.py @@ -0,0 +1,23 @@ +load("scs_bt_configurator.jar") +import scs_bt_configurator +p = scs_bt_configurator.start_it_up(getBundlePath(), "Default_Scene_with_Cube.blend") +try: + wait(Pattern("startup_screen.png").exact(), 5); type(Key.ESC); hover(Pattern("startup_screen.png").exact()); type(Key.ESC) + keyDown(Key.SHIFT); type(Key.RIGHT); keyUp(Key.SHIFT); + find(Pattern("startup_screen_last_frame.png").exact()) + click(Pattern("export_scene_button.png").similar(0.90)) + wait(1.5) + hover(Location(300, 400)) # move cursor to 3D view + type(2 * Key.ESC) # hide warnings + type("2") # switch to 2nd collection + type(Key.F3 + "SCS Import" + Key.ENTER) # do import + hover(Pattern("new_folder_button.png").exact()); mouseMove(50, 0); paste(scs_bt_configurator.get_path_property("SCSBasePath")) + wait(0.1); click(Pattern("scene_with_cube_file.png").similar(0.95)); type(Key.ENTER) + find(Pattern("after_import_screen.png").exact()) + keyDown(Key.SHIFT); type(Key.RIGHT); keyUp(Key.SHIFT); + find(Pattern("after_import_screen_last_frame.png").exact()) +except: + scs_bt_configurator.save_screenshot(getBundlePath(), Screen()) + raise +finally: + scs_bt_configurator.close_blender(p) diff --git a/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/Default_Scene_with_Cube.blend b/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/Default_Scene_with_Cube.blend new file mode 100644 index 0000000..ef3332a Binary files /dev/null and b/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/Default_Scene_with_Cube.blend differ diff --git a/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/Default_Scene_with_Cube.blend1 b/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/Default_Scene_with_Cube.blend1 new file mode 100644 index 0000000..bcaa911 Binary files /dev/null and b/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/Default_Scene_with_Cube.blend1 differ diff --git a/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/after_import_screen.png b/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/after_import_screen.png new file mode 100644 index 0000000..7ebb70a Binary files /dev/null and b/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/after_import_screen.png differ diff --git a/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/after_import_screen_last_frame.png b/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/after_import_screen_last_frame.png new file mode 100644 index 0000000..604c781 Binary files /dev/null and b/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/after_import_screen_last_frame.png differ diff --git a/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/export_scene_button.png b/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/export_scene_button.png new file mode 100644 index 0000000..8dc269d Binary files /dev/null and b/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/export_scene_button.png differ diff --git a/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/new_folder_button.png b/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/new_folder_button.png new file mode 100644 index 0000000..5ec3e74 Binary files /dev/null and b/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/new_folder_button.png differ diff --git a/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/scene_with_cube_file.png b/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/scene_with_cube_file.png new file mode 100644 index 0000000..fca69ce Binary files /dev/null and b/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/scene_with_cube_file.png differ diff --git a/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/startup_screen.png b/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/startup_screen.png new file mode 100644 index 0000000..55392a6 Binary files /dev/null and b/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/startup_screen.png differ diff --git a/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/startup_screen_last_frame.png b/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/startup_screen_last_frame.png new file mode 100644 index 0000000..ede4090 Binary files /dev/null and b/test/sikuli/tests/unit/import-export/12_animated_cube.sikuli/startup_screen_last_frame.png differ