Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multi thread import #19

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
+28 −50
Open

Multi thread import #19

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
26714b3
maybe faster importing, maye less stable
aronwk-aaron Apr 27, 2022
ca567b1
spacing
aronwk-aaron Apr 27, 2022
d5c9b37
remove cruft
aronwk-aaron Apr 27, 2022
486ba4e
make workers equal to max lods
aronwk-aaron Apr 27, 2022
a7b6e68
cleanup places
aronwk-aaron Apr 27, 2022
b9cd2ab
newline in wrong spot
aronwk-aaron Apr 27, 2022
9a0cf74
remove passing the parrent into the export call
aronwk-aaron Apr 28, 2022
e6d928d
Merge branch 'master' into multi-thread_import
aronwk-aaron Dec 16, 2022
b5d7bba
bleh
aronwk-aaron Dec 21, 2022
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
78 changes: 28 additions & 50 deletions lu_toolbox/importldd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
from xml.dom import minidom
import uuid
import random
from multiprocessing import Process
from timeit import default_timer as timer
import numpy as np

from .materials import (
Expand Down Expand Up @@ -161,54 +163,36 @@ def convertldd_data(self, context, filepath, importLOD0, importLOD1, importLOD2,
col = bpy.data.collections.new(converter.scene.Name)
bpy.context.scene.collection.children.link(col)

procs = []
start = timer()
if importLOD0:
start = time.process_time()
converter.Export(
filename=filepath,
lod='0',
parent_collection=col,
useNormals=useNormals
)
end = time.process_time()
self.report({'INFO'}, f'Time taken to Load LOD0: {end - start} seconds')
proc = Process(target=converter.Export, args=(useNormals, "0"))
procs.append(proc)
proc.start()
if importLOD1:
start = time.process_time()
converter.Export(
filename=filepath,
lod='1',
parent_collection=col,
useNormals=useNormals
)
end = time.process_time()
self.report({'INFO'}, f'Time taken to Load LOD1: {end - start} seconds')
proc = Process(target=converter.Export, args=(useNormals, "1"))
procs.append(proc)
proc.start()
if importLOD2:
start = time.process_time()
converter.Export(
filename=filepath,
lod='2',
parent_collection=col,
useNormals=useNormals
)
end = time.process_time()
self.report({'INFO'}, f'Time taken to Load LOD2: {end - start} seconds')
LOD3_exists = False
proc = Process(target=converter.Export, args=(useNormals, "2"))
procs.append(proc)
proc.start()
if importLOD3:
for dirpath, dirnames, filenames in os.walk(primaryBrickDBPath):
for dirname in dirnames:
if dirname == "lod3":
LOD3_exists = True
if LOD3_exists:
start = time.process_time()
converter.Export(
filename=filepath,
lod='3',
parent_collection=col,
useNormals=useNormals
)
end = time.process_time()
self.report({'INFO'}, f'Time taken to Load LOD3: {end - start} seconds')
else:
self.report({'INFO'}, f'LOD3 does not exist, skipping')
proc = Process(target=converter.Export, args=(useNormals, "3"))
procs.append(proc)
proc.start()
break


for proc in procs:
proc.join()
end = timer()
print(f'Time taken to Load: {end - start} seconds')
self.report({'INFO'}, f'Time taken to Load: {end - start} seconds')

except Exception as e:
self.report({'ERROR'}, str(e))

Expand Down Expand Up @@ -946,7 +930,7 @@ def LoadScene(self, filename):
if self.database.initok:
self.scene = Scene(file=filename)

def Export(self, filename, lod=None, parent_collection=None, useNormals=True):
def Export(self, useNormals=True, lod=None):
invert = Matrix3D()
usedmaterials = []
geometriecache = {}
Expand All @@ -956,15 +940,8 @@ def Export(self, filename, lod=None, parent_collection=None, useNormals=True):
miny = 1000

global_matrix = axis_conversion(from_forward='-Z', from_up='Y', to_forward='Y', to_up='Z').to_4x4()
if lod is not None:
col = bpy.data.collections.new(self.scene.Name + '_LOD_' + lod)
else:
col = bpy.data.collections.new(self.scene.Name)

if parent_collection:
parent_collection.children.link(col)
else:
bpy.context.scene.collection.children.link(col)
col = bpy.data.collections.new(self.scene.Name + '_LOD_' + lod)

for bri in self.scene.Bricks:
current += 1
Expand Down Expand Up @@ -1164,6 +1141,7 @@ def Export(self, filename, lod=None, parent_collection=None, useNormals=True):
useplane = True
if useplane is True: # write the floor plane in case True
i = 0
return col


def setDBFolderVars(dbfolderlocation):
Expand Down