Add sailing warships

Also lets models have a default view for each form. Fixes some incorrect
behaviors with the setup of entities to go along with this (e.g. if there
was no default form, the last form would wind up being the default, rather
than the first, if default views were specified.

macrovision.js

@@ -1735,6 +1735,12 @@ function makeEntity(info, views, sizes, forms = {}) {
                 }
             });
 
+            Object.entries(this.forms).forEach(([formKey, form]) => {
+                if (this.defaultForm === undefined) {
+                    this.defaultForm = formKey;
+                }
+            });
+
             Object.entries(this.views).forEach(([viewKey, view]) => {
                 view.parent = this;
                 if (this.defaultView === undefined) {
@@ -1744,7 +1750,7 @@ function makeEntity(info, views, sizes, forms = {}) {
                 }
 
                 if (view.default) {
-                    if (forms === {} || this.defaultForm === view.form) {
+                    if (forms === {} || this.defaultForm === view.form || this.defaultForm === undefined) {
                         this.defaultView = viewKey;
                         this.view = viewKey;
                         this.form = view.form;

media/attribution.js

@@ -24877,7 +24877,17 @@ const attributionData = {
                 "mechwarrior-online"
             ]
         },
-
+        {
+            prefix: "./media/vehicles/Sailing Warships",
+            all: "https://gamemodels3d.com/",
+            authors: [
+                "gamemodels3d",
+                "naval-action"
+            ],
+            owners: [
+                "naval-action"
+            ]
+        },
     ],
     people: {
         "ahastar": {
@@ -32220,6 +32230,10 @@ const attributionData = {
             "name": "MechWarrior Online",
             "url": "https://mwomercs.com"
         },
+        "naval-action": {
+            "name": "Naval Action",
+            "url": "https://www.navalaction.com"
+        },
     }
 }
 

presets/objects.js

@@ -175,6 +175,10 @@ function makeModel(data) {
                 form: form.name
             }
 
+            if (data.default_view == view.name) {
+                views[viewId].default = true
+            }
+
             if (view.area) {
                 views[viewId].attributes["area"] = {
                     name: "Area",

scripts/blender/addons/macrovision/ops.py

@@ -480,6 +480,11 @@ class MVExport(bpy.types.Operator):
             all_data["forms"].append(data)
             coll.hide_render = True
 
+        all_data["sort"] = context.scene.mv_sort
+
+        if context.scene.mv_override_default_view:
+            all_data["default_view"] = context.scene.mv_default_view
+
         with open(workdir.joinpath("data.json"), "w") as file:
             json.dump(all_data, file)
 
@@ -487,7 +492,7 @@ class MVExport(bpy.types.Operator):
 
 class MVImportObj(bpy.types.Operator, ImportHelper):
     bl_idname = "mv.import_obj"
-    bl_label = "Import from a directory of .zip files containing .obj files"
+    bl_label = "Import .obj files"
     filepath: StringProperty(subtype="FILE_PATH")
     filename_ext = "."
     use_filter_folder = True

scripts/blender/addons/macrovision/props.py

@@ -132,6 +132,25 @@ scene_props["mv_clobber"] = bpy.props.BoolProperty(
     description = "Overwrite existing form data",
     default = False
 )
+
+scene_props["mv_sort"] = bpy.props.BoolProperty(
+    name = "Sort",
+    description = "Tell Macrovision to sort the forms",
+    default = False
+)
+
+scene_props["mv_override_default_view"] = bpy.props.BoolProperty(
+    name = "Override Default View",
+    description = "Specify which view should be the default.",
+    default = False
+)
+
+scene_props["mv_default_view"] = bpy.props.StringProperty(
+    name = "Default View",
+    description = "The default view to display for each form.",
+    default = ""
+)
+
 collection_props["mv_entity_volume"] = bpy.props.PointerProperty(
     type = MVScientificNumber,
 )

scripts/blender/addons/macrovision/ui.py

@@ -73,6 +73,11 @@ class MVScenePanel(bpy.types.Panel):
         box.label(text="Execute")
 
         box.prop(context.scene, "mv_clobber")
+        box.prop(context.scene, "mv_sort")
+        box.prop(context.scene, "mv_override_default_view")
+
+        if context.scene.mv_override_default_view:
+            box.prop(context.scene, "mv_default_view")
 
         op_props = box.operator("mv.export")
 

scripts/process-model.py

@@ -77,11 +77,11 @@ for data in all_data["forms"]:
 
         procs = []
 
-        procs.append(subprocess.Popen(["magick", "convert", input, "-channel", "RGB", "-evaluate", "set", "0", "-channel", "RGB", "-modulate", "1000,0", "-background", "#FFFFFF", "-flatten", input_base], shell=False))
-        procs.append(subprocess.Popen(["magick", "convert", input, "-channel", "GB", "-evaluate", "set", "0", "-channel", "RGB", "-modulate", "1000,0", "-background", "#FFFFFF", "-negate", "-flatten", input_dark], shell=False))
-        procs.append(subprocess.Popen(["magick", "convert", input, "-channel", "RB", "-evaluate", "set", "0", "-channel", "RGB", "-modulate", "1000,0", "-background", "#FFFFFF", "-negate", "-flatten", input_medium], shell=False))
-        procs.append(subprocess.Popen(["magick", "convert", input, "-channel", "RG", "-evaluate", "set", "0", "-channel", "RGB", "-modulate", "1000,0", "-background", "#FFFFFF", "-negate", "-flatten", input_light], shell=False))
-        procs.append(subprocess.Popen(["magick", "convert", input, "-fill", "black", "-fuzz", "10%", "+opaque", "#FFFFFF", "-channel", "RGB", "-modulate", "1000,0", "-background", "#FFFFFF", "-negate", "-flatten", input_bright], shell=False))
+        procs.append(subprocess.Popen(["magick", "convert", input, "-channel", "RGB", "-evaluate", "set", "0", "-channel", "RGB", "-modulate", "200,0", "-background", "#FFFFFF", "-flatten", input_base], shell=False))
+        procs.append(subprocess.Popen(["magick", "convert", input, "-channel", "GB", "-evaluate", "set", "0", "-channel", "RGB", "-modulate", "200,0", "-background", "#FFFFFF", "-negate", "-flatten", input_dark], shell=False))
+        procs.append(subprocess.Popen(["magick", "convert", input, "-channel", "RB", "-evaluate", "set", "0", "-channel", "RGB", "-modulate", "200,0", "-background", "#FFFFFF", "-negate", "-flatten", input_medium], shell=False))
+        procs.append(subprocess.Popen(["magick", "convert", input, "-channel", "RG", "-evaluate", "set", "0", "-channel", "RGB", "-modulate", "200,0", "-background", "#FFFFFF", "-negate", "-flatten", input_light], shell=False))
+        procs.append(subprocess.Popen(["magick", "convert", input, "-fill", "black", "-fuzz", "10%", "+opaque", "#FFFFFF", "-channel", "RGB", "-modulate", "200,0", "-background", "#FFFFFF", "-negate", "-flatten", input_bright], shell=False))
 
         # to correct for extra height from lines
         procs.append(subprocess.Popen(["magick", "convert", input_noline_raw, "-channel", "RGB", "-evaluate", "set", "0", "-background", "#FFFFFF", "-flatten", input_noline], shell=False))