diff --git a/macrovision.js b/macrovision.js
index f8dae504..a84dca28 100644
--- a/macrovision.js
+++ b/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;
diff --git a/media/attribution.js b/media/attribution.js
index 224b1b7f..b7fdaf10 100644
--- a/media/attribution.js
+++ b/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"
+ },
}
}
diff --git a/media/vehicles/Sailing Warships/HMS Cerberus-Angled.svg b/media/vehicles/Sailing Warships/HMS Cerberus-Angled.svg
new file mode 100644
index 00000000..32844f24
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Cerberus-Angled.svg
@@ -0,0 +1,4121 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Cerberus-Back Corner.svg b/media/vehicles/Sailing Warships/HMS Cerberus-Back Corner.svg
new file mode 100644
index 00000000..7c7d1147
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Cerberus-Back Corner.svg
@@ -0,0 +1,9941 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Cerberus-Back.svg b/media/vehicles/Sailing Warships/HMS Cerberus-Back.svg
new file mode 100644
index 00000000..00b91035
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Cerberus-Back.svg
@@ -0,0 +1,4208 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Cerberus-Bottom.svg b/media/vehicles/Sailing Warships/HMS Cerberus-Bottom.svg
new file mode 100644
index 00000000..bbfee46b
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Cerberus-Bottom.svg
@@ -0,0 +1,1433 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Cerberus-Corner.svg b/media/vehicles/Sailing Warships/HMS Cerberus-Corner.svg
new file mode 100644
index 00000000..1bd296d8
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Cerberus-Corner.svg
@@ -0,0 +1,5156 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Cerberus-Front.svg b/media/vehicles/Sailing Warships/HMS Cerberus-Front.svg
new file mode 100644
index 00000000..b7d37d6b
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Cerberus-Front.svg
@@ -0,0 +1,2735 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Cerberus-Side.svg b/media/vehicles/Sailing Warships/HMS Cerberus-Side.svg
new file mode 100644
index 00000000..deecb2aa
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Cerberus-Side.svg
@@ -0,0 +1,3335 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Cerberus-Top.svg b/media/vehicles/Sailing Warships/HMS Cerberus-Top.svg
new file mode 100644
index 00000000..6a8de4c9
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Cerberus-Top.svg
@@ -0,0 +1,3422 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Implacable-Angled.svg b/media/vehicles/Sailing Warships/HMS Implacable-Angled.svg
new file mode 100644
index 00000000..ea48912e
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Implacable-Angled.svg
@@ -0,0 +1,7469 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Implacable-Back Corner.svg b/media/vehicles/Sailing Warships/HMS Implacable-Back Corner.svg
new file mode 100644
index 00000000..b2458c74
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Implacable-Back Corner.svg
@@ -0,0 +1,15386 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Implacable-Back.svg b/media/vehicles/Sailing Warships/HMS Implacable-Back.svg
new file mode 100644
index 00000000..facb4f9a
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Implacable-Back.svg
@@ -0,0 +1,8795 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Implacable-Bottom.svg b/media/vehicles/Sailing Warships/HMS Implacable-Bottom.svg
new file mode 100644
index 00000000..9c81dafe
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Implacable-Bottom.svg
@@ -0,0 +1,2234 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Implacable-Corner.svg b/media/vehicles/Sailing Warships/HMS Implacable-Corner.svg
new file mode 100644
index 00000000..22a80664
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Implacable-Corner.svg
@@ -0,0 +1,10025 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Implacable-Front.svg b/media/vehicles/Sailing Warships/HMS Implacable-Front.svg
new file mode 100644
index 00000000..9df33c66
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Implacable-Front.svg
@@ -0,0 +1,3200 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Implacable-Side.svg b/media/vehicles/Sailing Warships/HMS Implacable-Side.svg
new file mode 100644
index 00000000..347b999f
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Implacable-Side.svg
@@ -0,0 +1,6014 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Implacable-Top.svg b/media/vehicles/Sailing Warships/HMS Implacable-Top.svg
new file mode 100644
index 00000000..44acfbc2
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Implacable-Top.svg
@@ -0,0 +1,8288 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Indefatigable-Angled.svg b/media/vehicles/Sailing Warships/HMS Indefatigable-Angled.svg
new file mode 100644
index 00000000..5c17fce3
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Indefatigable-Angled.svg
@@ -0,0 +1,5963 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Indefatigable-Back Corner.svg b/media/vehicles/Sailing Warships/HMS Indefatigable-Back Corner.svg
new file mode 100644
index 00000000..509c3ecb
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Indefatigable-Back Corner.svg
@@ -0,0 +1,13907 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Indefatigable-Back.svg b/media/vehicles/Sailing Warships/HMS Indefatigable-Back.svg
new file mode 100644
index 00000000..02805d13
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Indefatigable-Back.svg
@@ -0,0 +1,7193 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Indefatigable-Bottom.svg b/media/vehicles/Sailing Warships/HMS Indefatigable-Bottom.svg
new file mode 100644
index 00000000..4648fdac
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Indefatigable-Bottom.svg
@@ -0,0 +1,2297 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Indefatigable-Corner.svg b/media/vehicles/Sailing Warships/HMS Indefatigable-Corner.svg
new file mode 100644
index 00000000..bda2989b
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Indefatigable-Corner.svg
@@ -0,0 +1,9044 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Indefatigable-Front.svg b/media/vehicles/Sailing Warships/HMS Indefatigable-Front.svg
new file mode 100644
index 00000000..1f917853
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Indefatigable-Front.svg
@@ -0,0 +1,2447 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Indefatigable-Side.svg b/media/vehicles/Sailing Warships/HMS Indefatigable-Side.svg
new file mode 100644
index 00000000..6edbe9d2
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Indefatigable-Side.svg
@@ -0,0 +1,5627 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Indefatigable-Top.svg b/media/vehicles/Sailing Warships/HMS Indefatigable-Top.svg
new file mode 100644
index 00000000..96820698
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Indefatigable-Top.svg
@@ -0,0 +1,7343 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Pickle-Angled.svg b/media/vehicles/Sailing Warships/HMS Pickle-Angled.svg
new file mode 100644
index 00000000..a864a72f
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Pickle-Angled.svg
@@ -0,0 +1,2123 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Pickle-Back Corner.svg b/media/vehicles/Sailing Warships/HMS Pickle-Back Corner.svg
new file mode 100644
index 00000000..fdb2ad5f
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Pickle-Back Corner.svg
@@ -0,0 +1,3545 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Pickle-Back.svg b/media/vehicles/Sailing Warships/HMS Pickle-Back.svg
new file mode 100644
index 00000000..9dad88a2
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Pickle-Back.svg
@@ -0,0 +1,3491 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Pickle-Bottom.svg b/media/vehicles/Sailing Warships/HMS Pickle-Bottom.svg
new file mode 100644
index 00000000..3b28dae9
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Pickle-Bottom.svg
@@ -0,0 +1,731 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Pickle-Corner.svg b/media/vehicles/Sailing Warships/HMS Pickle-Corner.svg
new file mode 100644
index 00000000..fa65da0e
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Pickle-Corner.svg
@@ -0,0 +1,2747 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Pickle-Front.svg b/media/vehicles/Sailing Warships/HMS Pickle-Front.svg
new file mode 100644
index 00000000..82332a38
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Pickle-Front.svg
@@ -0,0 +1,1022 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Pickle-Side.svg b/media/vehicles/Sailing Warships/HMS Pickle-Side.svg
new file mode 100644
index 00000000..f22b9777
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Pickle-Side.svg
@@ -0,0 +1,1874 @@
+
+
diff --git a/media/vehicles/Sailing Warships/HMS Pickle-Top.svg b/media/vehicles/Sailing Warships/HMS Pickle-Top.svg
new file mode 100644
index 00000000..693c51ac
--- /dev/null
+++ b/media/vehicles/Sailing Warships/HMS Pickle-Top.svg
@@ -0,0 +1,2396 @@
+
+
diff --git a/media/vehicles/Sailing Warships/Le Requin-Angled.svg b/media/vehicles/Sailing Warships/Le Requin-Angled.svg
new file mode 100644
index 00000000..b155e1e5
--- /dev/null
+++ b/media/vehicles/Sailing Warships/Le Requin-Angled.svg
@@ -0,0 +1,4895 @@
+
+
diff --git a/media/vehicles/Sailing Warships/Le Requin-Back Corner.svg b/media/vehicles/Sailing Warships/Le Requin-Back Corner.svg
new file mode 100644
index 00000000..786c4eba
--- /dev/null
+++ b/media/vehicles/Sailing Warships/Le Requin-Back Corner.svg
@@ -0,0 +1,4634 @@
+
+
diff --git a/media/vehicles/Sailing Warships/Le Requin-Back.svg b/media/vehicles/Sailing Warships/Le Requin-Back.svg
new file mode 100644
index 00000000..9ebc1e54
--- /dev/null
+++ b/media/vehicles/Sailing Warships/Le Requin-Back.svg
@@ -0,0 +1,1508 @@
+
+
diff --git a/media/vehicles/Sailing Warships/Le Requin-Bottom.svg b/media/vehicles/Sailing Warships/Le Requin-Bottom.svg
new file mode 100644
index 00000000..52b04212
--- /dev/null
+++ b/media/vehicles/Sailing Warships/Le Requin-Bottom.svg
@@ -0,0 +1,2267 @@
+
+
diff --git a/media/vehicles/Sailing Warships/Le Requin-Corner.svg b/media/vehicles/Sailing Warships/Le Requin-Corner.svg
new file mode 100644
index 00000000..f4eeda66
--- /dev/null
+++ b/media/vehicles/Sailing Warships/Le Requin-Corner.svg
@@ -0,0 +1,4652 @@
+
+
diff --git a/media/vehicles/Sailing Warships/Le Requin-Front.svg b/media/vehicles/Sailing Warships/Le Requin-Front.svg
new file mode 100644
index 00000000..46774f11
--- /dev/null
+++ b/media/vehicles/Sailing Warships/Le Requin-Front.svg
@@ -0,0 +1,1966 @@
+
+
diff --git a/media/vehicles/Sailing Warships/Le Requin-Side.svg b/media/vehicles/Sailing Warships/Le Requin-Side.svg
new file mode 100644
index 00000000..7c26d109
--- /dev/null
+++ b/media/vehicles/Sailing Warships/Le Requin-Side.svg
@@ -0,0 +1,3032 @@
+
+
diff --git a/media/vehicles/Sailing Warships/Le Requin-Top.svg b/media/vehicles/Sailing Warships/Le Requin-Top.svg
new file mode 100644
index 00000000..984b89ec
--- /dev/null
+++ b/media/vehicles/Sailing Warships/Le Requin-Top.svg
@@ -0,0 +1,5489 @@
+
+
diff --git a/media/vehicles/Sailing Warships/Lynx-Angled.svg b/media/vehicles/Sailing Warships/Lynx-Angled.svg
new file mode 100644
index 00000000..afd97b7a
--- /dev/null
+++ b/media/vehicles/Sailing Warships/Lynx-Angled.svg
@@ -0,0 +1,2354 @@
+
+
diff --git a/media/vehicles/Sailing Warships/Lynx-Back Corner.svg b/media/vehicles/Sailing Warships/Lynx-Back Corner.svg
new file mode 100644
index 00000000..8871dab3
--- /dev/null
+++ b/media/vehicles/Sailing Warships/Lynx-Back Corner.svg
@@ -0,0 +1,2414 @@
+
+
diff --git a/media/vehicles/Sailing Warships/Lynx-Back.svg b/media/vehicles/Sailing Warships/Lynx-Back.svg
new file mode 100644
index 00000000..079fd6c4
--- /dev/null
+++ b/media/vehicles/Sailing Warships/Lynx-Back.svg
@@ -0,0 +1,1823 @@
+
+
diff --git a/media/vehicles/Sailing Warships/Lynx-Bottom.svg b/media/vehicles/Sailing Warships/Lynx-Bottom.svg
new file mode 100644
index 00000000..3081bf4f
--- /dev/null
+++ b/media/vehicles/Sailing Warships/Lynx-Bottom.svg
@@ -0,0 +1,695 @@
+
+
diff --git a/media/vehicles/Sailing Warships/Lynx-Corner.svg b/media/vehicles/Sailing Warships/Lynx-Corner.svg
new file mode 100644
index 00000000..07148b00
--- /dev/null
+++ b/media/vehicles/Sailing Warships/Lynx-Corner.svg
@@ -0,0 +1,2321 @@
+
+
diff --git a/media/vehicles/Sailing Warships/Lynx-Front.svg b/media/vehicles/Sailing Warships/Lynx-Front.svg
new file mode 100644
index 00000000..e63a0a51
--- /dev/null
+++ b/media/vehicles/Sailing Warships/Lynx-Front.svg
@@ -0,0 +1,1322 @@
+
+
diff --git a/media/vehicles/Sailing Warships/Lynx-Side.svg b/media/vehicles/Sailing Warships/Lynx-Side.svg
new file mode 100644
index 00000000..e7cfeca3
--- /dev/null
+++ b/media/vehicles/Sailing Warships/Lynx-Side.svg
@@ -0,0 +1,1577 @@
+
+
diff --git a/media/vehicles/Sailing Warships/Lynx-Top.svg b/media/vehicles/Sailing Warships/Lynx-Top.svg
new file mode 100644
index 00000000..50156b21
--- /dev/null
+++ b/media/vehicles/Sailing Warships/Lynx-Top.svg
@@ -0,0 +1,2225 @@
+
+
diff --git a/media/vehicles/Sailing Warships/SantÃsima Trinidad-Angled.svg b/media/vehicles/Sailing Warships/SantÃsima Trinidad-Angled.svg
new file mode 100644
index 00000000..c4ab1015
--- /dev/null
+++ b/media/vehicles/Sailing Warships/SantÃsima Trinidad-Angled.svg
@@ -0,0 +1,6839 @@
+
+
diff --git a/media/vehicles/Sailing Warships/SantÃsima Trinidad-Back Corner.svg b/media/vehicles/Sailing Warships/SantÃsima Trinidad-Back Corner.svg
new file mode 100644
index 00000000..de4c1324
--- /dev/null
+++ b/media/vehicles/Sailing Warships/SantÃsima Trinidad-Back Corner.svg
@@ -0,0 +1,15197 @@
+
+
diff --git a/media/vehicles/Sailing Warships/SantÃsima Trinidad-Back.svg b/media/vehicles/Sailing Warships/SantÃsima Trinidad-Back.svg
new file mode 100644
index 00000000..b6e64d15
--- /dev/null
+++ b/media/vehicles/Sailing Warships/SantÃsima Trinidad-Back.svg
@@ -0,0 +1,7487 @@
+
+
diff --git a/media/vehicles/Sailing Warships/SantÃsima Trinidad-Bottom.svg b/media/vehicles/Sailing Warships/SantÃsima Trinidad-Bottom.svg
new file mode 100644
index 00000000..e28aa131
--- /dev/null
+++ b/media/vehicles/Sailing Warships/SantÃsima Trinidad-Bottom.svg
@@ -0,0 +1,2807 @@
+
+
diff --git a/media/vehicles/Sailing Warships/SantÃsima Trinidad-Corner.svg b/media/vehicles/Sailing Warships/SantÃsima Trinidad-Corner.svg
new file mode 100644
index 00000000..2bee6472
--- /dev/null
+++ b/media/vehicles/Sailing Warships/SantÃsima Trinidad-Corner.svg
@@ -0,0 +1,8447 @@
+
+
diff --git a/media/vehicles/Sailing Warships/SantÃsima Trinidad-Front.svg b/media/vehicles/Sailing Warships/SantÃsima Trinidad-Front.svg
new file mode 100644
index 00000000..5475c5da
--- /dev/null
+++ b/media/vehicles/Sailing Warships/SantÃsima Trinidad-Front.svg
@@ -0,0 +1,3494 @@
+
+
diff --git a/media/vehicles/Sailing Warships/SantÃsima Trinidad-Side.svg b/media/vehicles/Sailing Warships/SantÃsima Trinidad-Side.svg
new file mode 100644
index 00000000..65de1313
--- /dev/null
+++ b/media/vehicles/Sailing Warships/SantÃsima Trinidad-Side.svg
@@ -0,0 +1,6014 @@
+
+
diff --git a/media/vehicles/Sailing Warships/SantÃsima Trinidad-Top.svg b/media/vehicles/Sailing Warships/SantÃsima Trinidad-Top.svg
new file mode 100644
index 00000000..b3abe6aa
--- /dev/null
+++ b/media/vehicles/Sailing Warships/SantÃsima Trinidad-Top.svg
@@ -0,0 +1,7274 @@
+
+
diff --git a/media/vehicles/Sailing Warships/USS Constitution-Angled.svg b/media/vehicles/Sailing Warships/USS Constitution-Angled.svg
new file mode 100644
index 00000000..8da99c49
--- /dev/null
+++ b/media/vehicles/Sailing Warships/USS Constitution-Angled.svg
@@ -0,0 +1,8687 @@
+
+
diff --git a/media/vehicles/Sailing Warships/USS Constitution-Back Corner.svg b/media/vehicles/Sailing Warships/USS Constitution-Back Corner.svg
new file mode 100644
index 00000000..62976e60
--- /dev/null
+++ b/media/vehicles/Sailing Warships/USS Constitution-Back Corner.svg
@@ -0,0 +1,17360 @@
+
+
diff --git a/media/vehicles/Sailing Warships/USS Constitution-Back.svg b/media/vehicles/Sailing Warships/USS Constitution-Back.svg
new file mode 100644
index 00000000..e2e73e7a
--- /dev/null
+++ b/media/vehicles/Sailing Warships/USS Constitution-Back.svg
@@ -0,0 +1,8966 @@
+
+
diff --git a/media/vehicles/Sailing Warships/USS Constitution-Bottom.svg b/media/vehicles/Sailing Warships/USS Constitution-Bottom.svg
new file mode 100644
index 00000000..893974c9
--- /dev/null
+++ b/media/vehicles/Sailing Warships/USS Constitution-Bottom.svg
@@ -0,0 +1,1883 @@
+
+
diff --git a/media/vehicles/Sailing Warships/USS Constitution-Corner.svg b/media/vehicles/Sailing Warships/USS Constitution-Corner.svg
new file mode 100644
index 00000000..2e80e73c
--- /dev/null
+++ b/media/vehicles/Sailing Warships/USS Constitution-Corner.svg
@@ -0,0 +1,9476 @@
+
+
diff --git a/media/vehicles/Sailing Warships/USS Constitution-Front.svg b/media/vehicles/Sailing Warships/USS Constitution-Front.svg
new file mode 100644
index 00000000..fabe687c
--- /dev/null
+++ b/media/vehicles/Sailing Warships/USS Constitution-Front.svg
@@ -0,0 +1,5462 @@
+
+
diff --git a/media/vehicles/Sailing Warships/USS Constitution-Side.svg b/media/vehicles/Sailing Warships/USS Constitution-Side.svg
new file mode 100644
index 00000000..2d9b6903
--- /dev/null
+++ b/media/vehicles/Sailing Warships/USS Constitution-Side.svg
@@ -0,0 +1,6098 @@
+
+
diff --git a/media/vehicles/Sailing Warships/USS Constitution-Top.svg b/media/vehicles/Sailing Warships/USS Constitution-Top.svg
new file mode 100644
index 00000000..3c56cc41
--- /dev/null
+++ b/media/vehicles/Sailing Warships/USS Constitution-Top.svg
@@ -0,0 +1,5798 @@
+
+
diff --git a/presets/objects.js b/presets/objects.js
index ad10b718..70c382e4 100644
--- a/presets/objects.js
+++ b/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",
diff --git a/presets/vehicles.js b/presets/vehicles.js
index 2a2e04b3..c8fa8abd 100644
--- a/presets/vehicles.js
+++ b/presets/vehicles.js
@@ -780,6 +780,7 @@ function makeVehicles() {
/* ***Tanks*** */ results.push(makeModel({"name": "Tanks", "kind": "vehicles", "trace_alpha": 0.25, "sort": true, "forms": [{"name": "M1A1 Abrams", "views": [{"name": "Front", "height": 3.028367757797241, "extra": 1.0013411674543364, "bottom": 0.001337579617834337}, {"name": "Angled", "height": 3.028367757797241, "extra": 1.001082251082251, "bottom": 0.0010799136069114472}, {"name": "Corner", "height": 3.028367757797241, "extra": 1.0009943323863637, "bottom": 0.0009923589171432405}, {"name": "Side", "height": 3.028367757797241, "extra": 1.0017021276595746, "bottom": 0.0016963528413910093}, {"name": "Back Corner", "height": 3.028367757797241, "extra": 1.001417434443657, "bottom": 0.0014134275618374558}, {"name": "Back", "height": 3.028367757797241, "extra": 1.0013411674543364, "bottom": 0.001337579617834337}, {"name": "Top", "height": 9.81060791015625, "extra": 1.000525385111227, "bottom": 0.0005248336316750113}, {"name": "Bottom", "height": 9.81060791015625, "extra": 1.0005540595899918, "bottom": 0.000553446305525449}]}, {"name": "Leopard 2A5", "views": [{"name": "Front", "height": 2.990591287612915, "extra": 1.001958224543081, "bottom": 0.0019505851755526658}, {"name": "Angled", "height": 2.990591287612915, "extra": 1.002109259627618, "bottom": 0.0021003990537660252}, {"name": "Corner", "height": 2.990591287612915, "extra": 1.0013425805919327, "bottom": 0.0013389852008456945}, {"name": "Side", "height": 2.990591287612915, "extra": 1.0017376194613379, "bottom": 0.0017316017316017316}, {"name": "Back Corner", "height": 2.990591287612915, "extra": 1.0013454326963727, "bottom": 0.0013418220338983337}, {"name": "Back", "height": 2.990591287612915, "extra": 1.001958224543081, "bottom": 0.0019505851755526658}, {"name": "Top", "height": 9.891084671020508, "extra": 1.0003676470588236, "bottom": 0.00036737692872889965}, {"name": "Bottom", "height": 9.891084671020508, "extra": 1.000498949579832, "bottom": 0.0004984521748255656}]}, {"name": "M3A3 Bradley", "views": [{"name": "Front", "height": 3.440152645111084, "extra": 1.0013130252100841, "bottom": 0.0013095861707700367}, {"name": "Angled", "height": 3.440152645111084, "extra": 1.0017045454545455, "bottom": 0.0016987542468857276}, {"name": "Corner", "height": 3.440152645111084, "extra": 1.0014385480739976, "bottom": 0.0014344211065573666}, {"name": "Side", "height": 3.440152645111084, "extra": 1.0016566214859437, "bottom": 0.001651150822086959}, {"name": "Back Corner", "height": 3.440152645111084, "extra": 1.001078265568682, "bottom": 0.0010759452592285328}, {"name": "Back", "height": 3.440152645111084, "extra": 1.0015756302521008, "bottom": 0.0015706806282722514}, {"name": "Top", "height": 6.577320098876953, "extra": 1.0009726642508272, "bottom": 0.000970775773047238}, {"name": "Bottom", "height": 6.577320098876953, "extra": 1.0008665056191577, "bottom": 0.0008650065530799953}]}, {"name": "M1128 Stryker MGS", "views": [{"name": "Front", "height": 3.578094005584717, "extra": 1.0015756302521008, "bottom": 0.0015706806282722514}, {"name": "Angled", "height": 3.578094005584717, "extra": 1.0014016213349495, "bottom": 0.0013977032336052503}, {"name": "Corner", "height": 3.578094005584717, "extra": 1.0012464504898546, "bottom": 0.0012433509390805465}, {"name": "Side", "height": 3.578094005584717, "extra": 1.0015483742627054, "bottom": 0.0015435941398291248}, {"name": "Back Corner", "height": 3.578094005584717, "extra": 1.0021619805720103, "bottom": 0.00215267249976552}, {"name": "Back", "height": 3.578094005584717, "extra": 1.0015756302521008, "bottom": 0.0015706806282722514}, {"name": "Top", "height": 8.121484756469727, "extra": 1.0010504201680672, "bottom": 0.0010482180293501049}, {"name": "Bottom", "height": 8.121484756469727, "extra": 1.001029306722689, "bottom": 0.0010271921311568156}]}, {"name": "T28 Super Heavy Tank", "views": [{"name": "Front", "height": 2.899054527282715, "extra": 1.0013003901170352, "bottom": 0.0012970168612191958}, {"name": "Angled", "height": 2.899054527282715, "extra": 1.0021367521367521, "bottom": 0.002127659574468085}, {"name": "Corner", "height": 2.899054527282715, "extra": 1.0008249464057069, "bottom": 0.0008235875744881428}, {"name": "Side", "height": 2.899054527282715, "extra": 1.000102890946502, "bottom": 0.00010286977776445375}, {"name": "Back Corner", "height": 2.899054527282715, "extra": 1.0008387293729373, "bottom": 0.0008373247951364307}, {"name": "Back", "height": 2.899054527282715, "extra": 1.0013614792855774, "bottom": 0.0013577821011672496}, {"name": "Top", "height": 11.380563735961914, "extra": 1.0005252100840336, "bottom": 0.0005246589716684155}, {"name": "Bottom", "height": 11.380563735961914, "extra": 1.0005252100840336, "bottom": 0.0005246589716684155}]}, {"name": "Challenger 2", "views": [{"name": "Front", "height": 3.2104392051696777, "extra": 1.000985142076858, "bottom": 0.0009832048838555193}, {"name": "Angled", "height": 3.2104392051696777, "extra": 1.0019307310344894, "bottom": 0.0019233042680113022}, {"name": "Corner", "height": 3.2104392051696777, "extra": 1.0014982022235674, "bottom": 0.0014937264150943713}, {"name": "Side", "height": 3.2104392051696777, "extra": 1.001547135678392, "bottom": 0.001542363188157088}, {"name": "Back Corner", "height": 3.2104392051696777, "extra": 1.0020511439263355, "bottom": 0.002042763920717712}, {"name": "Back", "height": 3.2104392051696777, "extra": 1.0013327265635157, "bottom": 0.0013291836867016498}, {"name": "Top", "height": 12.292409896850586, "extra": 1.0006463825770542, "bottom": 0.0006455480350490813}, {"name": "Bottom", "height": 12.292409896850586, "extra": 1.0008408219034106, "bottom": 0.0008394103142541887}]}, {"name": "Centurion Mk3", "views": [{"name": "Front", "height": 3.0065624713897705, "extra": 1.001813784764208, "bottom": 0.0018072289156626507}, {"name": "Angled", "height": 3.0065624713897705, "extra": 1.0010460251046025, "bottom": 0.0010438413361169101}, {"name": "Corner", "height": 3.0065624713897705, "extra": 1.0014285714285713, "bottom": 0.0014245014245014246}, {"name": "Side", "height": 3.0065624713897705, "extra": 1.0017421602787457, "bottom": 0.001736111111111111}, {"name": "Back Corner", "height": 3.0065624713897705, "extra": 1.0014285714285713, "bottom": 0.0014245014245014246}, {"name": "Back", "height": 3.0065624713897705, "extra": 1.001813784764208, "bottom": 0.0018072289156626507}, {"name": "Top", "height": 9.990520477294922, "extra": 1.0005251825009192, "bottom": 0.0005246314464088978}, {"name": "Bottom", "height": 9.990520477294922, "extra": 1.0005251549207017, "bottom": 0.0005246039240373517}]}, {"name": "BMP-1", "views": [{"name": "Front", "height": 2.7867891788482666, "extra": 1.0015381617227412, "bottom": 0.0015334443519289733}, {"name": "Angled", "height": 2.7867891788482666, "extra": 1.0019484839844122, "bottom": 0.0019409202802499095}, {"name": "Corner", "height": 2.7867891788482666, "extra": 1.0015902018348624, "bottom": 0.0015851603849569413}, {"name": "Side", "height": 2.7867891788482666, "extra": 1.0013494602583077, "bottom": 0.0013458279755726103}, {"name": "Back Corner", "height": 2.7867891788482666, "extra": 1.001834862385321, "bottom": 0.0018281535648994515}, {"name": "Back", "height": 2.7867891788482666, "extra": 1.0015381617227412, "bottom": 0.0015334443519289733}, {"name": "Top", "height": 6.823264122009277, "extra": 1.0011817226890756, "bottom": 0.0011789363374377785}, {"name": "Bottom", "height": 6.823264122009277, "extra": 1.0011029411764707, "bottom": 0.0011005135730008052}]}, {"name": "BMP-3", "views": [{"name": "Front", "height": 2.802197217941284, "extra": 1.0015157411597388, "bottom": 0.0015111601045997576}, {"name": "Angled", "height": 2.802197217941284, "extra": 1.0019441266954274, "bottom": 0.001936596716677122}, {"name": "Corner", "height": 2.802197217941284, "extra": 1.002677975179621, "bottom": 0.0026637084891815875}, {"name": "Side", "height": 2.802197217941284, "extra": 1.0023151437057762, "bottom": 0.002304473331917157}, {"name": "Back Corner", "height": 2.802197217941284, "extra": 1.0016644198174707, "bottom": 0.001658897613345059}, {"name": "Back", "height": 2.802197217941284, "extra": 1.0016091537914538, "bottom": 0.0016039916529542407}, {"name": "Top", "height": 7.262314796447754, "extra": 1.000931643907563, "bottom": 0.0009299112153263788}, {"name": "Bottom", "height": 7.262314796447754, "extra": 1.0008241071428572, "bottom": 0.000822751072785357}]}, {"name": "KV2", "views": [{"name": "Front", "height": 3.4385173320770264, "extra": 1.0014963771920613, "bottom": 0.0014919122650893244}, {"name": "Angled", "height": 3.4385173320770264, "extra": 1.0011654743655254, "bottom": 0.0011627640222034315}, {"name": "Corner", "height": 3.4385173320770264, "extra": 1.001167287791203, "bottom": 0.0011645690168123927}, {"name": "Side", "height": 3.4385173320770264, "extra": 1.0014046457476775, "bottom": 0.0014007107429001011}, {"name": "Back Corner", "height": 3.4385173320770264, "extra": 1.000986971820455, "bottom": 0.0009850274318196626}, {"name": "Back", "height": 3.4385173320770264, "extra": 1.0015227093725387, "bottom": 0.0015180861644767123}, {"name": "Top", "height": 6.815186500549316, "extra": 1.0010766806722688, "bottom": 0.0010743671715318665}, {"name": "Bottom", "height": 6.815186500549316, "extra": 1.0010766806722688, "bottom": 0.0010743671715318665}]}, {"name": "Panzer VIII Maus", "views": [{"name": "Front", "height": 3.593390464782715, "extra": 1.0015044498381878, "bottom": 0.001499936679199097}, {"name": "Angled", "height": 3.593390464782715, "extra": 1.0012503964096575, "bottom": 0.0012472772277227128}, {"name": "Corner", "height": 3.593390464782715, "extra": 1.0013683536105866, "bottom": 0.0013646190477843811}, {"name": "Side", "height": 3.593390464782715, "extra": 1.000847442218798, "bottom": 0.0008460083324413882}, {"name": "Back Corner", "height": 3.593390464782715, "extra": 1.0013683536105866, "bottom": 0.0013646190477843811}, {"name": "Back", "height": 3.593390464782715, "extra": 1.0015044498381878, "bottom": 0.001499936679199097}, {"name": "Top", "height": 10.546064376831055, "extra": 1.0003939075630253, "bottom": 0.00039359748097612176}, {"name": "Bottom", "height": 10.546064376831055, "extra": 1.0005252100840336, "bottom": 0.0005246589716684155}]}, {"name": "Leclerc Serie 2", "views": [{"name": "Front", "height": 3.047330856323242, "extra": 1.0019233155478346, "bottom": 0.0019159456118664456}, {"name": "Angled", "height": 3.047330856323242, "extra": 1.0009369512419986, "bottom": 0.0009351987706991811}, {"name": "Corner", "height": 3.047330856323242, "extra": 1.0015582598315145, "bottom": 0.0015534185719899736}, {"name": "Side", "height": 3.047330856323242, "extra": 1.001585388515407, "bottom": 0.00158037749075924}, {"name": "Back Corner", "height": 3.047330856323242, "extra": 1.001490596635282, "bottom": 0.0014861660869448245}, {"name": "Back", "height": 3.047330856323242, "extra": 1.0018922943293214, "bottom": 0.0018851597750171097}, {"name": "Top", "height": 10.588752746582031, "extra": 1.0005024458386917, "bottom": 0.0005019414419141464}, {"name": "Bottom", "height": 10.588752746582031, "extra": 1.0006231330693736, "bottom": 0.0006223574463619689}]}]}));
/* ***Helicopters*** */ results.push(makeModel({"name": "Helicopters", "kind": "vehicles", "trace_alpha": 0.25, "sort": true, "forms": [{"name": "AH-64D", "views": [{"name": "Front", "height": 5.108381271362305}, {"name": "Angled", "height": 5.108381271362305}, {"name": "Corner", "height": 5.108381271362305}, {"name": "Side", "height": 5.108381271362305}, {"name": "Back Corner", "height": 5.108381271362305}, {"name": "Back", "height": 5.108381271362305}, {"name": "Top", "height": 17.766433715820312}, {"name": "Bottom", "height": 17.766433715820312}]}, {"name": "Mi-24D \"Hind\"", "views": [{"name": "Front", "height": 5.288262367248535}, {"name": "Angled", "height": 5.288262367248535}, {"name": "Corner", "height": 5.288262367248535}, {"name": "Side", "height": 5.288262367248535}, {"name": "Back Corner", "height": 5.288262367248535}, {"name": "Back", "height": 5.288262367248535}, {"name": "Top", "height": 21.228628158569336}, {"name": "Bottom", "height": 21.228628158569336}]}, {"name": "UH-1C \"Huey\"", "views": [{"name": "Front", "height": 4.85120153427124, "extra": 1.0012345679012347, "bottom": 0.0012315270935961307}, {"name": "Angled", "height": 4.85120153427124, "extra": 1.001466275659824, "bottom": 0.0014619883040935349}, {"name": "Corner", "height": 4.85120153427124, "extra": 1.0021222411380606, "bottom": 0.0021132713950796135}, {"name": "Side", "height": 4.85120153427124, "extra": 1.0027729394254186, "bottom": 0.002757645855589896}, {"name": "Back Corner", "height": 4.85120153427124, "extra": 1.002261596563179, "bottom": 0.002251412987429553}, {"name": "Back", "height": 4.85120153427124, "extra": 1.0011722878907277, "bottom": 0.0011695458019650147}, {"name": "Top", "height": 15.264501571655273, "extra": 1.000639898141342, "bottom": 0.0006390802488152436}, {"name": "Bottom", "height": 15.264501571655273, "extra": 1.001050365001838, "bottom": 0.001048163094177454}]}]}));
/* ***BattleMechs*** */ results.push(makeModel({"name": "BattleMechs", "kind": "vehicles", "trace_alpha": 0.25, "sort": true, "forms": [{"name": "Orion ON1-V", "views": [{"name": "Front", "height": 19.242650985717773, "extra": 1.000892482150357, "bottom": 0.0008908919400482368}, {"name": "Angled", "height": 19.242650985717773, "extra": 1.000982327608844, "bottom": 0.0009804014580042388}, {"name": "Corner", "height": 19.242650985717773, "extra": 1.0007878151260505, "bottom": 0.0007865757734661773}, {"name": "Side", "height": 19.242650985717773, "extra": 1.000840203749409, "bottom": 0.0008387942332895985}, {"name": "Back Corner", "height": 19.242650985717773, "extra": 1.0011819089142198, "bottom": 0.0011791216853579288}, {"name": "Back", "height": 19.242650985717773, "extra": 1.0006827372511948, "bottom": 0.0006818062621282606}, {"name": "Top", "height": 8.696438789367676, "extra": 1.0015082956259427, "bottom": 0.0015037593984962407}, {"name": "Bottom", "height": 8.696438789367676, "extra": 1.0015082956259427, "bottom": 0.0015037593984962407}]}, {"name": "Mad Cat Mk.II McII-A", "views": [{"name": "Front", "height": 18.5931396484375, "extra": 1.0008928571428573, "bottom": 0.0008912655971479739}, {"name": "Angled", "height": 18.5931396484375, "extra": 1.0009191176470589, "bottom": 0.0009174311926605505}, {"name": "Corner", "height": 18.5931396484375, "extra": 1.0008665966386554, "bottom": 0.0008650972579037716}, {"name": "Side", "height": 18.5931396484375, "extra": 1.0008689600840335, "bottom": 0.0008674525208028017}, {"name": "Back Corner", "height": 18.5931396484375, "extra": 1.0008665966386554, "bottom": 0.0008650972579037716}, {"name": "Back", "height": 18.5931396484375, "extra": 1.0008928571428573, "bottom": 0.0008912655971479739}, {"name": "Top", "height": 10.632101058959961, "extra": 1.0011808755760367, "bottom": 0.0011780932130337077}, {"name": "Bottom", "height": 10.632101058959961, "extra": 1.0011808755760367, "bottom": 0.0011780932130337077}]}, {"name": "Catapult CPLT-K2", "views": [{"name": "Front", "height": 15.076629638671875, "extra": 1.0007847084809176, "bottom": 0.0007834788758804551}, {"name": "Angled", "height": 15.076629638671875, "extra": 1.000755396250197, "bottom": 0.0007542567247938204}, {"name": "Corner", "height": 15.076629638671875, "extra": 1.0007878151260505, "bottom": 0.0007865757734661773}, {"name": "Side", "height": 15.076629638671875, "extra": 1.0007818183689818, "bottom": 0.0007805977975879041}, {"name": "Back Corner", "height": 15.076629638671875, "extra": 1.0007649159663865, "bottom": 0.000763747560979207}, {"name": "Back", "height": 15.076629638671875, "extra": 1.0005296775681354, "bottom": 0.0005291170452757011}, {"name": "Top", "height": 8.290498733520508, "extra": 1.001310615989515, "bottom": 0.00130718954248366}, {"name": "Bottom", "height": 8.290498733520508, "extra": 1.001310615989515, "bottom": 0.00130718954248366}]}, {"name": "Javelin JVN-10P", "views": [{"name": "Front", "height": 13.98193073272705, "extra": 1.0010504201680672, "bottom": 0.0010482180293501049}, {"name": "Angled", "height": 13.98193073272705, "extra": 1.0009977419524234, "bottom": 0.000995754939468629}, {"name": "Corner", "height": 13.98193073272705, "extra": 1.0010504201680672, "bottom": 0.0010482180293501049}, {"name": "Side", "height": 13.98193073272705, "extra": 1.0010503098414032, "bottom": 0.0010481081647626034}, {"name": "Back Corner", "height": 13.98193073272705, "extra": 1.0010766806722688, "bottom": 0.0010743671715318665}, {"name": "Back", "height": 13.98193073272705, "extra": 1.0010209558823528, "bottom": 0.0010188754286284472}, {"name": "Top", "height": 6.904259204864502, "extra": 1.0019299291152535, "bottom": 0.0019225085049772743}, {"name": "Bottom", "height": 6.904259204864502, "extra": 1.0019690207403518, "bottom": 0.001961297071129707}]}, {"name": "Locust LCT-1E", "views": [{"name": "Front", "height": 9.575200080871582, "extra": 1.0014421025976181, "bottom": 0.001437955239645508}, {"name": "Angled", "height": 9.575200080871582, "extra": 1.001549868697479, "bottom": 0.0015450793572173251}, {"name": "Corner", "height": 9.575200080871582, "extra": 1.0015492070160696, "bottom": 0.001544421758023045}, {"name": "Side", "height": 9.575200080871582, "extra": 1.001482694327731, "bottom": 0.001478310562360202}, {"name": "Back Corner", "height": 9.575200080871582, "extra": 1.001611565030184, "bottom": 0.001606387434555058}, {"name": "Back", "height": 9.575200080871582, "extra": 1.0016167463360823, "bottom": 0.0016115354480202716}, {"name": "Top", "height": 4.680999755859375, "extra": 1.0025193270600754, "bottom": 0.0025066966825080107}, {"name": "Bottom", "height": 4.680999755859375, "extra": 1.002667901206887, "bottom": 0.0026537413672939247}]}, {"name": "Centurion CN9-A", "views": [{"name": "Front", "height": 15.192169189453125, "extra": 1.0010504201680672, "bottom": 0.0010482180293501049}, {"name": "Angled", "height": 15.192169189453125, "extra": 1.0010766806722688, "bottom": 0.0010743671715318665}, {"name": "Corner", "height": 15.192169189453125, "extra": 1.0010504201680672, "bottom": 0.0010482180293501049}, {"name": "Side", "height": 15.192169189453125, "extra": 1.0010244222689075, "bottom": 0.0010223276784278362}, {"name": "Back Corner", "height": 15.192169189453125, "extra": 1.0010241596638656, "bottom": 0.0010220661460244485}, {"name": "Back", "height": 15.192169189453125, "extra": 1.0010504201680672, "bottom": 0.0010482180293501049}, {"name": "Top", "height": 9.315898895263672, "extra": 1.0016820242796547, "bottom": 0.0016763848396501126}, {"name": "Bottom", "height": 9.315898895263672, "extra": 1.0016820242796547, "bottom": 0.0016763848396501126}]}, {"name": "Timber Wolf TBR-D", "views": [{"name": "Front", "height": 15.806550979614258, "extra": 1.001050365001838, "bottom": 0.001048163094177454}, {"name": "Angled", "height": 15.806550979614258, "extra": 1.0010504201680672, "bottom": 0.0010482180293501049}, {"name": "Corner", "height": 15.806550979614258, "extra": 1.0010504201680672, "bottom": 0.0010482180293501049}, {"name": "Side", "height": 15.806550979614258, "extra": 1.0010504201680672, "bottom": 0.0010482180293501049}, {"name": "Back Corner", "height": 15.806550979614258, "extra": 1.0011029411764707, "bottom": 0.0011005135730008052}, {"name": "Back", "height": 15.806550979614258, "extra": 1.001076624126884, "bottom": 0.0010743108688816448}, {"name": "Top", "height": 8.977701187133789, "extra": 1.0013155161670013, "bottom": 0.0013120640839721642}, {"name": "Bottom", "height": 8.977701187133789, "extra": 1.0014618959602137, "bottom": 0.0014576341412885344}]}, {"name": "Hellfire HLF-1", "views": [{"name": "Front", "height": 15.027021408081055, "extra": 1.0011029411764707, "bottom": 0.0011005135730008052}, {"name": "Angled", "height": 15.027021408081055, "extra": 1.0009132752192407, "bottom": 0.0009116101173809773}, {"name": "Corner", "height": 15.027021408081055, "extra": 1.0009714855852543, "bottom": 0.0009696016771487993}, {"name": "Side", "height": 15.027021408081055, "extra": 1.0011280962510483, "bottom": 0.0011255567782843033}, {"name": "Back Corner", "height": 15.027021408081055, "extra": 1.000813214136164, "bottom": 0.0008118936493786663}, {"name": "Back", "height": 15.027021408081055, "extra": 1.001129201680672, "bottom": 0.0011266572341874252}, {"name": "Top", "height": 8.786240577697754, "extra": 1.0015974440894568, "bottom": 0.0015923566878980893}, {"name": "Bottom", "height": 8.786240577697754, "extra": 1.0015974440894568, "bottom": 0.0015923566878980893}]}, {"name": "Warhammer IIC WHM-IIC-2", "views": [{"name": "Front", "height": 18.07369041442871, "extra": 1.0010404127934458, "bottom": 0.0010382523713458255}, {"name": "Angled", "height": 18.07369041442871, "extra": 1.0009047340659056, "bottom": 0.0009030999353528377}, {"name": "Corner", "height": 18.07369041442871, "extra": 1.0008550420168068, "bottom": 0.0008535823193110568}, {"name": "Side", "height": 18.07369041442871, "extra": 1.0010504201680672, "bottom": 0.0010482180293501049}, {"name": "Back Corner", "height": 18.07369041442871, "extra": 1.0008140756302522, "bottom": 0.000812752346494654}, {"name": "Back", "height": 18.07369041442871, "extra": 1.0010251286629555, "bottom": 0.0010230311857722396}, {"name": "Top", "height": 9.755419731140137, "extra": 1.0013679890560876, "bottom": 0.001364256480218281}, {"name": "Bottom", "height": 9.755419731140137, "extra": 1.0013679890560876, "bottom": 0.001364256480218281}]}, {"name": "Mauler MAL-MX90", "views": [{"name": "Front", "height": 18.73101043701172, "extra": 1.0009053358542095, "bottom": 0.0009036995509994764}, {"name": "Angled", "height": 18.73101043701172, "extra": 1.0009234506302522, "bottom": 0.0009217482522432121}, {"name": "Corner", "height": 18.73101043701172, "extra": 1.0012737588652483, "bottom": 0.0012705221874487408}, {"name": "Side", "height": 18.73101043701172, "extra": 1.0010504201680672, "bottom": 0.0010482180293501049}, {"name": "Back Corner", "height": 18.73101043701172, "extra": 1.0009378446510162, "bottom": 0.0009360888391948024}, {"name": "Back", "height": 18.73101043701172, "extra": 1.0008871179497951, "bottom": 0.0008855467809056884}, {"name": "Top", "height": 8.012378692626953, "extra": 1.0018920623479592, "bottom": 0.0018849295395385595}, {"name": "Bottom", "height": 8.012378692626953, "extra": 1.0018018018018018, "bottom": 0.0017953321364452424}]}, {"name": "Shadow Hawk SHD-2D", "views": [{"name": "Front", "height": 16.58738136291504, "extra": 1.0008205545635962, "bottom": 0.0008192101503414468}, {"name": "Angled", "height": 16.58738136291504, "extra": 1.000876943277311, "bottom": 0.0008754079111458338}, {"name": "Corner", "height": 16.58738136291504, "extra": 1.000870758483034, "bottom": 0.0008692446786783905}, {"name": "Side", "height": 16.58738136291504, "extra": 1.001076624126884, "bottom": 0.0010743108688816448}, {"name": "Back Corner", "height": 16.58738136291504, "extra": 1.000939059627003, "bottom": 0.0009372992672024626}, {"name": "Back", "height": 16.58738136291504, "extra": 1.0008205545635962, "bottom": 0.0008192101503414468}, {"name": "Top", "height": 8.649438858032227, "extra": 1.0016104187088644, "bottom": 0.0016052484645449152}, {"name": "Bottom", "height": 8.649438858032227, "extra": 1.0016128343369275, "bottom": 0.0016076485952153665}]}, {"name": "Stalker STK-5M", "views": [{"name": "Front", "height": 18.072290420532227, "extra": 1.0009059398140854, "bottom": 0.0009043013289298506}, {"name": "Angled", "height": 18.072290420532227, "extra": 1.0008111443726697, "bottom": 0.0008098305936119588}, {"name": "Corner", "height": 18.072290420532227, "extra": 1.0001969124133585, "bottom": 0.00019683489489016613}, {"name": "Side", "height": 18.072290420532227, "extra": 1.000733867156734, "bottom": 0.0007327916133385913}, {"name": "Back Corner", "height": 18.072290420532227, "extra": 1.000493934779184, "bottom": 0.0004934473176001861}, {"name": "Back", "height": 18.072290420532227, "extra": 1.0002100288789708, "bottom": 0.00020994069175450775}, {"name": "Top", "height": 11.11400032043457, "extra": 1.0015359242116952, "bottom": 0.0015312205343111455}, {"name": "Bottom", "height": 11.11400032043457, "extra": 1.0017205600357246, "bottom": 0.001714659685863922}]}, {"name": "Commando COM-2D", "views": [{"name": "Front", "height": 10.656279563903809, "extra": 1.0014966915239996, "bottom": 0.0014922247238074815}, {"name": "Angled", "height": 10.656279563903809, "extra": 1.001627980254175, "bottom": 0.0016226968174203877}, {"name": "Corner", "height": 10.656279563903809, "extra": 1.0016413125941332, "bottom": 0.00163594240837695}, {"name": "Side", "height": 10.656279563903809, "extra": 1.0016375902801906, "bottom": 0.0016322443851106683}, {"name": "Back Corner", "height": 10.656279563903809, "extra": 1.0015227893299725, "bottom": 0.0015181656371059907}, {"name": "Back", "height": 10.656279563903809, "extra": 1.0015229492700346, "bottom": 0.0015183246073298905}, {"name": "Top", "height": 4.866259574890137, "extra": 1.0026107979455223, "bottom": 0.0025972362275087932}, {"name": "Bottom", "height": 4.866259574890137, "extra": 1.0028175313059033, "bottom": 0.0028017433069464233}]}, {"name": "Atlas AS7-K3", "views": [{"name": "Front", "height": 19.985469818115234, "extra": 1.0009159621948018, "bottom": 0.0009142872896167872}, {"name": "Angled", "height": 19.985469818115234, "extra": 1.0005648760764545, "bottom": 0.0005642386266512974}, {"name": "Corner", "height": 19.985469818115234, "extra": 1.0006525013523526, "bottom": 0.0006516509461055274}, {"name": "Side", "height": 19.985469818115234, "extra": 1.0005580758699548, "bottom": 0.0005574536670745041}, {"name": "Back Corner", "height": 19.985469818115234, "extra": 1.0009782680060404, "bottom": 0.0009763577269867659}, {"name": "Back", "height": 19.985469818115234, "extra": 1.000922236807561, "bottom": 0.0009205388978522498}, {"name": "Top", "height": 7.53287935256958, "extra": 1.001161014995266, "bottom": 0.0011583253291131879}, {"name": "Bottom", "height": 7.53287935256958, "extra": 1.0008576316259046, "bottom": 0.0008561630808344492}]}, {"name": "Zeus ZEU-9S", "views": [{"name": "Front", "height": 20.56538963317871, "extra": 1.0007878151260505, "bottom": 0.0007865757734661773}, {"name": "Angled", "height": 20.56538963317871, "extra": 1.001101888441411, "bottom": 0.0010994654648360674}, {"name": "Corner", "height": 20.56538963317871, "extra": 1.000985789443001, "bottom": 0.0009838497056942927}, {"name": "Side", "height": 20.56538963317871, "extra": 1.0008140756302522, "bottom": 0.000812752346494654}, {"name": "Back Corner", "height": 20.56538963317871, "extra": 1.0009714345725687, "bottom": 0.0009695508621140974}, {"name": "Back", "height": 20.56538963317871, "extra": 1.0009978991596638, "bottom": 0.0009959115211237361}, {"name": "Top", "height": 10.611200332641602, "extra": 1.001235290293219, "bottom": 0.0012322459303457363}, {"name": "Bottom", "height": 10.611200332641602, "extra": 1.0012357723577234, "bottom": 0.0012327256212287443}]}, {"name": "King Crab KGC-000", "views": [{"name": "Front", "height": 17.4248104095459, "extra": 1.0009715876267002, "bottom": 0.0009697033231995684}, {"name": "Angled", "height": 17.4248104095459, "extra": 1.0009453285016543, "bottom": 0.0009435445824814984}, {"name": "Corner", "height": 17.4248104095459, "extra": 1.00052911112282, "bottom": 0.0005285517975498621}, {"name": "Side", "height": 17.4248104095459, "extra": 1.0009978991596638, "bottom": 0.0009959115211237361}, {"name": "Back Corner", "height": 17.4248104095459, "extra": 1.0010504201680672, "bottom": 0.0010482180293501049}, {"name": "Back", "height": 17.4248104095459, "extra": 1.001005094537815, "bottom": 0.0010030781610536861}, {"name": "Top", "height": 13.934221267700195, "extra": 1.0010169672964728, "bottom": 0.0010149030500507937}, {"name": "Bottom", "height": 13.934221267700195, "extra": 1.001028881156317, "bottom": 0.0010267683111824398}]}, {"name": "Dire Wolf DWF-A", "views": [{"name": "Front", "height": 16.94127082824707, "extra": 1.0009661292863519, "bottom": 0.0009642660749622106}, {"name": "Angled", "height": 16.94127082824707, "extra": 1.0012871703267836, "bottom": 0.0012838652203532178}, {"name": "Corner", "height": 16.94127082824707, "extra": 1.0009570197561999, "bottom": 0.0009551914819616029}, {"name": "Side", "height": 16.94127082824707, "extra": 1.0010241596638656, "bottom": 0.0010220661460244485}, {"name": "Back Corner", "height": 16.94127082824707, "extra": 1.0010271242516542, "bottom": 0.0010250186087113389}, {"name": "Back", "height": 16.94127082824707, "extra": 1.0009853752034867, "bottom": 0.0009834370944327472}, {"name": "Top", "height": 9.353300094604492, "extra": 1.001437587657784, "bottom": 0.0014334661911754106}, {"name": "Bottom", "height": 9.353300094604492, "extra": 1.001437587657784, "bottom": 0.0014334661911754106}]}, {"name": "BattleMaster BLR-3M", "views": [{"name": "Front", "height": 18.355831146240234, "extra": 1.0010966496368578, "bottom": 0.0010942496199611382}, {"name": "Angled", "height": 18.355831146240234, "extra": 1.000840203749409, "bottom": 0.0008387942332895985}, {"name": "Corner", "height": 18.355831146240234, "extra": 1.0012083004990806, "bottom": 0.0012053875583040484}, {"name": "Side", "height": 18.355831146240234, "extra": 1.0008140756302522, "bottom": 0.000812752346494654}, {"name": "Back Corner", "height": 18.355831146240234, "extra": 1.0012871027055426, "bottom": 0.0012837979459233103}, {"name": "Back", "height": 18.355831146240234, "extra": 1.000985434916799, "bottom": 0.000983496573071796}, {"name": "Top", "height": 10.153579711914062, "extra": 1.0013404825737264, "bottom": 0.001336898395721925}, {"name": "Bottom", "height": 10.153579711914062, "extra": 1.0013404825737264, "bottom": 0.001336898395721925}]}, {"name": "Jenner JR7-K", "views": [{"name": "Front", "height": 13.323670387268066, "extra": 1.0011820330969268, "bottom": 0.0011792452830188679}, {"name": "Angled", "height": 13.323670387268066, "extra": 1.0012083004990806, "bottom": 0.0012053875583040484}, {"name": "Corner", "height": 13.323670387268066, "extra": 1.0014451626464869, "bottom": 0.001440997694403689}, {"name": "Side", "height": 13.323670387268066, "extra": 1.0014160845849858, "bottom": 0.0014120853204757926}, {"name": "Back Corner", "height": 13.323670387268066, "extra": 1.0013662637940095, "bottom": 0.001362540614191456}, {"name": "Back", "height": 13.323670387268066, "extra": 1.0011820330969268, "bottom": 0.0011792452830188679}, {"name": "Top", "height": 8.308999061584473, "extra": 1.001522426267589, "bottom": 0.001517804775869312}, {"name": "Bottom", "height": 8.308999061584473, "extra": 1.0014965343415247, "bottom": 0.0014920684780901049}]}, {"name": "Hunchback HBK-4P", "views": [{"name": "Front", "height": 15.88750171661377, "extra": 1.0013137151865477, "bottom": 0.001310272536687631}, {"name": "Angled", "height": 15.88750171661377, "extra": 1.0012083004990806, "bottom": 0.0012053875583040484}, {"name": "Corner", "height": 15.88750171661377, "extra": 1.0013399894902786, "bottom": 0.0013364079450762301}, {"name": "Side", "height": 15.88750171661377, "extra": 1.0015255249445933, "bottom": 0.0015208846496515087}, {"name": "Back Corner", "height": 15.88750171661377, "extra": 1.0013137151865477, "bottom": 0.001310272536687631}, {"name": "Back", "height": 15.88750171661377, "extra": 1.0012083004990806, "bottom": 0.0012053875583040484}, {"name": "Top", "height": 7.665339469909668, "extra": 1.0024106802715629, "bottom": 0.0023991132814492598}, {"name": "Bottom", "height": 7.665339469909668, "extra": 1.0018611466684633, "bottom": 0.0018542446260467137}]}]}));
+ /* ***Sailing Warships*** */ results.push(makeModel({"name": "Sailing Warships", "kind": "vehicles", "trace_alpha": 0.25, "forms": [{"name": "HMS Indefatigable", "views": [{"name": "Front", "height": 57.06600570678711}, {"name": "Angled", "height": 57.06600570678711}, {"name": "Corner", "height": 57.06600570678711}, {"name": "Side", "height": 57.06600570678711}, {"name": "Back Corner", "height": 57.06600570678711}, {"name": "Back", "height": 57.06600570678711}, {"name": "Top", "height": 76.98500061035156}, {"name": "Bottom", "height": 76.98500061035156}]}, {"name": "HMS Cerberus", "views": [{"name": "Front", "height": 45.07007598876953}, {"name": "Angled", "height": 45.07007598876953}, {"name": "Corner", "height": 45.07007598876953}, {"name": "Side", "height": 45.07007598876953}, {"name": "Back Corner", "height": 45.07007598876953}, {"name": "Back", "height": 45.07007598876953}, {"name": "Top", "height": 57.21495819091797}, {"name": "Bottom", "height": 57.21495819091797}]}, {"name": "HMS Pickle", "views": [{"name": "Front", "height": 35.339900970458984}, {"name": "Angled", "height": 35.339900970458984}, {"name": "Corner", "height": 35.339900970458984}, {"name": "Side", "height": 35.339900970458984}, {"name": "Back Corner", "height": 35.339900970458984}, {"name": "Back", "height": 35.339900970458984}, {"name": "Top", "height": 41.53532028198242}, {"name": "Bottom", "height": 41.53532028198242}]}, {"name": "Lynx", "views": [{"name": "Front", "height": 36.244998931884766}, {"name": "Angled", "height": 36.244998931884766}, {"name": "Corner", "height": 36.244998931884766}, {"name": "Side", "height": 36.244998931884766}, {"name": "Back Corner", "height": 36.244998931884766}, {"name": "Back", "height": 36.244998931884766}, {"name": "Top", "height": 39.4050407409668}, {"name": "Bottom", "height": 39.4050407409668}]}, {"name": "USS Constitution", "views": [{"name": "Front", "height": 71.22599792480469}, {"name": "Angled", "height": 71.22599792480469}, {"name": "Corner", "height": 71.22599792480469}, {"name": "Side", "height": 71.22599792480469}, {"name": "Back Corner", "height": 71.22599792480469}, {"name": "Back", "height": 71.22599792480469}, {"name": "Top", "height": 93.91355895996094}, {"name": "Bottom", "height": 93.91355895996094}]}, {"name": "HMS Implacable", "views": [{"name": "Front", "height": 67.13400268554688}, {"name": "Angled", "height": 67.13400268554688}, {"name": "Corner", "height": 67.13400268554688}, {"name": "Side", "height": 67.13400268554688}, {"name": "Back Corner", "height": 67.13400268554688}, {"name": "Back", "height": 67.13400268554688}, {"name": "Top", "height": 84.33200073242188}, {"name": "Bottom", "height": 84.33200073242188}]}, {"name": "Le Requin", "views": [{"name": "Front", "height": 37.33704376220703}, {"name": "Angled", "height": 37.33704376220703}, {"name": "Corner", "height": 37.33704376220703}, {"name": "Side", "height": 37.33704376220703}, {"name": "Back Corner", "height": 37.33704376220703}, {"name": "Back", "height": 37.33704376220703}, {"name": "Top", "height": 60.72100067138672}, {"name": "Bottom", "height": 60.72100067138672}]}, {"name": "Santi\u0301sima Trinidad", "views": [{"name": "Front", "height": 78.73477172851562, "extra": 1.0004201460007351, "bottom": 0.00041979325182345305}, {"name": "Angled", "height": 78.73477172851562, "extra": 1.0004601407415188, "bottom": 0.0004597176718578734}, {"name": "Corner", "height": 78.73477172851562, "extra": 1.000493093487395, "bottom": 0.0004926076841132053}, {"name": "Side", "height": 78.73477172851562, "extra": 1.0003950445610266, "bottom": 0.00039473268702434715}, {"name": "Back Corner", "height": 78.73477172851562, "extra": 1.0004300157563026, "bottom": 0.000429646246990908}, {"name": "Back", "height": 78.73477172851562, "extra": 1.0004464285714287, "bottom": 0.0004460303300625158}, {"name": "Top", "height": 94.80522155761719, "extra": 1.0004778110393362, "bottom": 0.00047735486848455314}, {"name": "Bottom", "height": 94.80522155761719, "extra": 1.0003915966386554, "bottom": 0.0003912901828147869}]}], "sort": true, "default_view": "Side"}));
/* ***INSERT HERE*** */
results.sort((b1, b2) => {
diff --git a/scripts/blender/addons/macrovision/ops.py b/scripts/blender/addons/macrovision/ops.py
index e347a236..bd6e897b 100644
--- a/scripts/blender/addons/macrovision/ops.py
+++ b/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
diff --git a/scripts/blender/addons/macrovision/props.py b/scripts/blender/addons/macrovision/props.py
index b7ec6518..3fefd82e 100644
--- a/scripts/blender/addons/macrovision/props.py
+++ b/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,
)
diff --git a/scripts/blender/addons/macrovision/ui.py b/scripts/blender/addons/macrovision/ui.py
index c36cce7a..17bc8add 100644
--- a/scripts/blender/addons/macrovision/ui.py
+++ b/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")
diff --git a/scripts/process-model.py b/scripts/process-model.py
index 0f6238bc..2b9a498b 100644
--- a/scripts/process-model.py
+++ b/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))