Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update RoR im/export addons to Blender 2.82 #2529

Closed
wants to merge 2 commits into from
Closed

Update RoR im/export addons to Blender 2.82 #2529

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
380ec65
Update RoR im/export addons to Blender 2.82
grahamjamesaddis Apr 10, 2020
f5fb2af
Merge branch 'master' of github.com:RigsOfRods/rigs-of-rods
grahamjamesaddis Apr 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 11 additions & 11 deletions tools/blender/ror_export.py
View file
Open in desktop
Expand Up @@ -3,8 +3,8 @@
bl_info = {
"name": "RoR Exporter",
"author": "ulteq",
"version": (0, 0, 1),
"blender": (2, 79, 0),
"version": (0, 0, 2),
"blender": (2, 82, 0),
"category": "RoR",
}

Expand All @@ -15,28 +15,28 @@
from bpy_extras.io_utils import ExportHelper

def register():
bpy.app.debug = True
bpy.utils.register_class(ror_export)
bpy.types.INFO_MT_file_export.append(menu_func)
bpy.context.preferences.view.show_developer_ui = True
bpy.utils.register_class(ROR_OT_exporter)
bpy.types.TOPBAR_MT_file_export.append(menu_func)
return

def unregister():
bpy.types.INFO_MT_file_export.remove(menu_func)
bpy.utils.unregister_class(ror_export)
bpy.types.TOPBAR_MT_file_export.remove(menu_func)
bpy.utils.unregister_class(ROR_OT_exporter)
return

def menu_func(self, context):
self.layout.operator(ror_export.bl_idname, text="Truck (.truck)")
self.layout.operator(ROR_OT_exporter.bl_idname, text="Truck (.truck)")

class ror_export(bpy.types.Operator, ExportHelper):
class ROR_OT_exporter(bpy.types.Operator, ExportHelper):
bl_idname = "export_truck.truck"
bl_label = "Export RoR Truck"
filename_ext = ""
filter_glob = StringProperty(
filter_glob : StringProperty(
default="*.truck;*.trailer;*.load;*.car;*.boat;*.airplane;*.train;*.machine;*.fixed",
options={'HIDDEN'},
)
filepath = bpy.props.StringProperty(subtype="FILE_PATH")
filepath : bpy.props.StringProperty(subtype="FILE_PATH")

def execute(self, context):
nodes = []
Expand Down
30 changes: 15 additions & 15 deletions tools/blender/ror_import.py
View file
Open in desktop
Expand Up @@ -3,8 +3,8 @@
bl_info = {
"name": "RoR Importer",
"author": "ulteq",
"version": (0, 0, 1),
"blender": (2, 79, 0),
"version": (0, 0, 2),
"blender": (2, 82, 0),
"category": "RoR",
}

Expand All @@ -15,28 +15,28 @@
from bpy_extras.io_utils import ImportHelper

def register():
bpy.app.debug = True
bpy.utils.register_class(ror_import)
bpy.types.INFO_MT_file_import.append(menu_func)
bpy.context.preferences.view.show_developer_ui = True
bpy.utils.register_class(ROR_OT_importer)
bpy.types.TOPBAR_MT_file_import.append(menu_func)
return

def unregister():
bpy.types.INFO_MT_file_import.remove(menu_func)
bpy.utils.unregister_class(ror_import)
bpy.types.TOPBAR_MT_file_import.remove(menu_func)
bpy.utils.unregister_class(ROR_OT_importer)
return

def menu_func(self, context):
self.layout.operator(ror_import.bl_idname, text="Truck (.truck)")
self.layout.operator(ROR_OT_importer.bl_idname, text="Truck (.truck)")

class ror_import(bpy.types.Operator, ImportHelper):
class ROR_OT_importer(bpy.types.Operator, ImportHelper):
bl_idname = "import_truck.truck"
bl_label = "Import RoR Truck"
filename_ext = ""
filter_glob = StringProperty(
filter_glob : StringProperty(
default="*.truck;*.trailer;*.load;*.car;*.boat;*.airplane;*.train;*.machine;*.fixed",
options={'HIDDEN'},
)
filepath = bpy.props.StringProperty(subtype="FILE_PATH")
filepath : bpy.props.StringProperty(subtype="FILE_PATH")

def execute(self, context):
truckfile = []
Expand Down Expand Up @@ -101,9 +101,9 @@ def execute(self, context):
mesh = bpy.data.meshes.new(self.filepath + "-mesh")
obj = bpy.data.objects.new(self.filepath + "-obj", mesh)

bpy.context.scene.objects.link(obj)
bpy.context.scene.objects.active = obj
obj.select = True
bpy.context.collection.objects.link(obj)
bpy.context.view_layer.objects.active = obj
obj.select_set(True)

bpy.types.Object.RoRTruckFile = bpy.props.StringProperty()
bpy.context.active_object.RoRTruckFile = json.dumps(truckfile)
Expand Down Expand Up @@ -132,7 +132,7 @@ def execute(self, context):
for g in n[1]:
vg = obj.vertex_groups.get(g)
if not vg:
vg = obj.vertex_groups.new(g)
vg = obj.vertex_groups.new(name=g)
v[dl][vg.index] = 1.0
except:
print ("Failed to add vertex:", n)
Expand Down