Add support for Linux-native studiomdl

Author: JJL772

addon/types/model_export/model.py

@@ -7,6 +7,7 @@
 from pathlib import Path
 from traceback import print_exc
 from ... utils import common
+from ... utils import game as game_utils
 from . smd import SMD
 from . fbx import export_fbx
 
@@ -34,7 +35,7 @@ def __init__(self, game, model):
             directory = self.modelsrc.joinpath(self.name)
         self.directory = common.verify_folder(directory)
 
-        studiomdl = self.bin.joinpath('studiomdl.exe')
+        studiomdl = game_utils.get_studiomdl_path(game)
         quickmdl = self.bin.joinpath('quickmdl.exe')
         self.studiomdl = quickmdl if quickmdl.is_file() else studiomdl
         self.hlmv = self.bin.joinpath('hlmv.exe')
@@ -362,7 +363,7 @@ def view_model(self):
         # Use wine to run HLMV on Linux.
         # Wine tends to complain about the paths we feed HLMV.
         # So we use relatve paths working from the base directory of the game.
-        if (os.name == 'posix') and (self.studiomdl.suffix == '.exe'):
+        if (os.name == 'posix') and (self.hlmv.suffix == '.exe'):
             cwd = self.game.parent
             args = [str(self.wine), str(self.hlmv.relative_to(cwd)), '-game',
                     str(self.game.relative_to(cwd)), str(mdl.relative_to(cwd))]

addon/utils/game.py

@@ -1,19 +1,38 @@
 from pathlib import Path
 from ..utils.common import resolve
-
+import os
 
 def update_game(self, context):
-    self['game'] = resolve(self.game)
+    g = resolve(self.game)
+    # Don't bother re-resolving paths if we haven't changed our game path
+    if g == self['game']:
+        return
+
+    self['game'] = g
     game = Path(self.game)
 
     if game.joinpath('gameinfo.txt').is_file():
         bin = game.parent.joinpath('bin')
 
-        if not bin.joinpath('studiomdl.exe').is_file():
-            for path in bin.iterdir():
-                if path.is_dir() and path.joinpath('studiomdl.exe').is_file():
-                    bin = path
-                    break
+        # If we're not on the old-style pattern bin/<something> layout, check for platform subdirs
+        actualbin = None
+        if not bin.joinpath('studiomdl.exe').is_file() and not bin.joinpath('studiomdl').is_file():
+            def check_subdir(subdirs, smdl):
+                for s in subdirs:
+                    p = bin.joinpath(s)
+                    if p.is_dir() and p.joinpath(smdl).is_file():
+                        return p
+                return None
+
+            # For linux, prefer the native binaries (if possible)
+            if os.name == 'posix':
+                actualbin = check_subdir(['linux32', 'linux64'], 'studiomdl')
+            # Resolve windows paths
+            if actualbin is None:
+                actualbin = check_subdir(['win32', 'win64'], 'studiomdl.exe')
+
+        if actualbin is not None:
+            bin = actualbin
 
         self['bin'] = str(bin)
         self['modelsrc'] = str(game.joinpath('modelsrc'))
@@ -39,5 +58,12 @@ def update_mapsrc(self, context):
 
 def verify(game):
     gameinfo = Path(game.game).joinpath('gameinfo.txt')
-    studiomdl = Path(game.bin).joinpath('studiomdl.exe')
-    return gameinfo.is_file() and studiomdl.is_file()
+    return gameinfo.is_file() and get_studiomdl_path(game).is_file()
+
+def get_studiomdl_path(game):
+    if os.name == 'posix' and (game.bin.endswith('linux32') or game.bin.endswith('linux64')):
+        p = Path(game.bin).joinpath('studiomdl')
+        if p.is_file():
+            return p
+    return Path(game.bin).joinpath('studiomdl.exe')
+