qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-26 22:31:05 +00:00
Code Issues Projects Releases Packages Wiki Activity

Read strings as strings rather than bytes.

Browse source
This commit is contained in:
Bill Currie 2011-09-20 13:33:41 +09:00
parent a32e45d2d5
commit 9a4e5aef53
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tools/qfmdl/import_mdl.py
View file

@ -53,7 +53,7 @@ class MDL:
def read_pixels(self, mdl): def read_pixels(self, mdl):
size = self.width * self.height size = self.width * self.height
self.pixels = mdl.read_string(size) self.pixels = mdl.read_bytes(size)
class STVert: class STVert:
def __init__(self): def __init__(self):
@ -142,9 +142,16 @@ class MDL:
return data[0] return data[0]
return data return data
def read_string(self, size): def read_bytes(self, size):
return self.file.read(size) return self.file.read(size)
def read_string(self, size):
data = self.file.read(size)
s = ""
for c in data:
s = s + chr(c)
return s
def __init__(self): def __init__(self):
pass pass
def read(self, filepath): def read(self, filepath):
@ -153,7 +160,7 @@ class MDL:
self.name = self.name.split('.')[0] self.name = self.name.split('.')[0]
self.ident = self.read_string(4) self.ident = self.read_string(4)
self.version = self.read_int() self.version = self.read_int()
if self.ident not in [b"IDPO", b"MD16"] or self.version not in [3, 6]: if self.ident not in ["IDPO", "MD16"] or self.version not in [3, 6]:
return None return None
self.scale = Vector(self.read_float(3)) self.scale = Vector(self.read_float(3))
self.scale_origin = Vector(self.read_float(3)) self.scale_origin = Vector(self.read_float(3))