Compare commits
2 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
f451be4d18 | ||
![]() |
613cb20678 |
@@ -1,7 +1,7 @@
|
||||
bl_info = {
|
||||
'name': 'SWBF .msh Import-Export',
|
||||
'author': 'Will Snyder, SleepKiller',
|
||||
"version": (1, 0, 0),
|
||||
"version": (1, 2, 1),
|
||||
'blender': (2, 80, 0),
|
||||
'location': 'File > Import-Export',
|
||||
'description': 'Export as SWBF .msh file',
|
||||
|
@@ -138,6 +138,9 @@ class Reader:
|
||||
def how_much_left(self, pos):
|
||||
return self.end_pos - pos
|
||||
|
||||
def bytes_remaining(self):
|
||||
return self.end_pos - self.file.tell()
|
||||
|
||||
def skip_until(self, header):
|
||||
while (self.could_have_child() and header not in self.peak_next_header()):
|
||||
self.skip_bytes(1)
|
||||
|
@@ -165,19 +165,23 @@ def _read_matd(matd: Reader) -> Material:
|
||||
|
||||
elif next_header == "TX0D":
|
||||
with matd.read_child() as tx0d:
|
||||
mat.texture0 = tx0d.read_string()
|
||||
if tx0d.bytes_remaining() > 0:
|
||||
mat.texture0 = tx0d.read_string()
|
||||
|
||||
elif next_header == "TX1D":
|
||||
with matd.read_child() as tx1d:
|
||||
mat.texture1 = tx1d.read_string()
|
||||
if tx1d.bytes_remaining() > 0:
|
||||
mat.texture1 = tx1d.read_string()
|
||||
|
||||
elif next_header == "TX2D":
|
||||
with matd.read_child() as tx2d:
|
||||
mat.texture2 = tx2d.read_string()
|
||||
if tx2d.bytes_remaining() > 0:
|
||||
mat.texture2 = tx2d.read_string()
|
||||
|
||||
elif next_header == "TX3D":
|
||||
with matd.read_child() as tx3d:
|
||||
mat.texture3 = tx3d.read_string()
|
||||
if tx3d.bytes_remaining() > 0:
|
||||
mat.texture3 = tx3d.read_string()
|
||||
|
||||
else:
|
||||
matd.skip_bytes(1)
|
||||
@@ -203,7 +207,9 @@ def _read_modl(modl: Reader, materials_list: List[Material]) -> Model:
|
||||
|
||||
global model_counter
|
||||
global mndx_remap
|
||||
mndx_remap[index] = model_counter
|
||||
|
||||
if index not in mndx_remap:
|
||||
mndx_remap[index] = model_counter
|
||||
|
||||
model_counter += 1
|
||||
|
||||
|
Reference in New Issue
Block a user