Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions Converter/Sequence_Converter.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def start_conversion(self):

if(self.convertSettings is None):
return False

modelCount = len(self.convertSettings.modelPaths)
self.convertSettings.metaData.headerSizes = [None] * modelCount
self.convertSettings.metaData.verticeCounts = [None] * modelCount
Expand All @@ -105,7 +105,7 @@ def start_conversion(self):
self.process_models()
if(len(self.convertSettings.imagePaths) > 0 and (self.convertSettings.convertToDDS or self.convertSettings.convertToASTC)):
self.process_images()

return True

def terminate_conversion(self):
Expand Down Expand Up @@ -138,7 +138,7 @@ def finish_conversion(self, writeMetaData):
def write_metadata(self):
self.convertSettings.metaData.write_metaData(self.convertSettings.outputPath)

def process_models(self):
def process_models(self):

if self.debugMode:
self.firstEstimation = True
Expand Down Expand Up @@ -273,7 +273,7 @@ def convert_model(self, file):
self.convertSettings.hasNormals = True

if(len(normals) > 0 and self.convertSettings.saveNormals):

# Check if there are actual normals inside the array, or if it is just empty
x = normals[0][0]
y = normals[0][1]
Expand Down Expand Up @@ -384,15 +384,16 @@ def convert_model(self, file):
header += "comment Exported for use in Unity Geometry Streaming Plugin" + "\n"
header += "element vertex " + str(vertexCount) + "\n"

propertyText = "property " + "half" if self.convertSettings.useCompression else "float" + " "
propertyText = "property " + ("half" if self.convertSettings.useCompression else "float") + " "

header += propertyText + "x" + "\n"
header += propertyText + "y" + "\n"
header += propertyText + "z" + "\n"

header += propertyText + "nx" + "\n"
header += propertyText + "ny" + "\n"
header += propertyText + "nz" + "\n"
if(self.convertSettings.hasNormals):
header += propertyText + "nx" + "\n"
header += propertyText + "ny" + "\n"
header += propertyText + "nz" + "\n"

if(self.convertSettings.isPointcloud == True):
header += "property uchar red" + "\n"
Expand Down Expand Up @@ -483,7 +484,7 @@ def convert_model(self, file):

if(self.convertSettings.hasUVs == True):
if(self.convertSettings.useCompression):
uvs = uvs.astype(dtype=np.float16, casting='same_kind')
uvs = uvs.astype(dtype=np.float16, casting='same_kind')

uvsBytes = np.frombuffer(uvs.tobytes(), dtype=np.uint8)

Expand Down