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

Jump to bottom

Optimize terrain diskusage flag #138

Closed
wants to merge 3 commits into from
Closed

Optimize terrain diskusage flag #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ff13f7c
optimize_terrain_diskusage_flag
mazeyu Aug 22, 2023
d238623
no redundant glb saving
mazeyu Aug 22, 2023
ed81a10
Disable optimimze_terrain_diskusage unless using high_quality_terrain
pvl-bot Aug 27, 2023
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
4 changes: 3 additions & 1 deletion worldgen/config/performance/high_quality_terrain.gin
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@ OpaqueSphericalMesher.pixels_per_cube = 0.92
TransparentSphericalMesher.pixels_per_cube = 1.38

get_surface_type.degrade_sdf_to_displacement = 0
voronoi_grains_chance = 0.5
voronoi_grains_chance = 0.5

execute_tasks.optimize_terrain_diskusage=True
48 changes: 23 additions & 25 deletions worldgen/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,7 @@ def execute_tasks(
reset_assets=True,
focal_length=None,
dryrun=False,
optimize_terrain_diskusage=False,
):
if input_folder != output_folder:
if reset_assets:
Expand Down Expand Up @@ -333,39 +334,36 @@ def execute_tasks(

if Task.FineTerrain in task:
terrain = Terrain(scene_seed, surface.registry, task=task, on_the_fly_asset_folder=output_folder/"assets")
terrain.fine_terrain(output_folder)
terrain.fine_terrain(output_folder, optimize_terrain_diskusage=optimize_terrain_diskusage)

group_collections()

if task == [Task.FineTerrain]:
os.symlink(input_folder / output_blend_name, output_folder / output_blend_name)
os.symlink(input_folder / "MaskTag.json", output_folder / "MaskTag.json")
os.symlink(input_folder / "version.txt", output_folder / "version.txt")
os.symlink(input_folder / 'polycounts.txt', output_folder / 'polycounts.txt')
else:
if input_folder is not None:
for mesh in os.listdir(input_folder):
if (mesh.endswith(".glb") or mesh.endswith(".b_displacement.npy")) and not os.path.islink(output_folder / mesh):
os.symlink(input_folder / mesh, output_folder / mesh)
if Task.Coarse in task or Task.Populate in task:

with Timer(f'Writing output blendfile'):
logging.info(f'Writing output blendfile to {output_folder / output_blend_name}')
bpy.ops.wm.save_mainfile(filepath=str(output_folder / output_blend_name))
tag_system.save_tag(path=str(output_folder / "MaskTag.json"))

with (output_folder/ "version.txt").open('w') as f:
f.write(f"{VERSION}\n")

with (output_folder/'polycounts.txt').open('w') as f:
save_polycounts(f)
if input_folder is not None:
for mesh in os.listdir(input_folder):
if (mesh.endswith(".glb") or mesh.endswith(".b_displacement.npy")) and not os.path.islink(output_folder / mesh):
os.symlink(input_folder / mesh, output_folder / mesh)
if Task.Coarse in task or Task.Populate in task or Task.FineTerrain in task:

with Timer(f'Writing output blendfile'):
logging.info(f'Writing output blendfile to {output_folder / output_blend_name}')
if optimize_terrain_diskusage and task == [Task.FineTerrain]: os.symlink(input_folder / output_blend_name, output_folder / output_blend_name)
else: bpy.ops.wm.save_mainfile(filepath=str(output_folder / output_blend_name))

tag_system.save_tag(path=str(output_folder / "MaskTag.json"))

with (output_folder/ "version.txt").open('w') as f:
f.write(f"{VERSION}\n")

with (output_folder/'polycounts.txt').open('w') as f:
save_polycounts(f)

for col in bpy.data.collections['unique_assets'].children:
col.hide_viewport = False

if Task.Render in task or Task.GroundTruth in task or Task.MeshSave in task:
terrain = Terrain(scene_seed, surface.registry, task=task, on_the_fly_asset_folder=output_folder/"assets")
terrain.load_glb(output_folder)
if optimize_terrain_diskusage:
terrain.load_glb(output_folder)

if Task.Render in task or Task.GroundTruth in task:
render(scene_seed, output_folder=output_folder, camera_id=camera_id, resample_idx=resample_idx)
Expand Down
39 changes: 23 additions & 16 deletions worldgen/terrain/core.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ def coarse_terrain(self):
self.tag_terrain(self.terrain_objs[name])
return main_obj

def fine_terrain(self, output_folder):
def fine_terrain(self, output_folder, optimize_terrain_diskusage=True):
# redo sampling to achieve attribute -> surface correspondance
self.sample_surface_templates()
if (self.on_the_fly_asset_folder / Assets.Ocean).exists():
Expand All @@ -267,28 +267,35 @@ def fine_terrain(self, output_folder):
for mesh_name in fine_meshes:
obj = fine_meshes[mesh_name].export_blender(mesh_name + "_fine")
if mesh_name not in hidden_in_viewport: self.tag_terrain(obj)
Mesh(obj=obj).save(output_folder / f"{mesh_name}.glb")
np.save(output_folder / f"{mesh_name}.b_displacement", fine_meshes[mesh_name].blender_displacements)
delete(obj)
if not optimize_terrain_diskusage:
object_to_copy_from = bpy.data.objects[mesh_name]
self.copy_materials_and_displacements(mesh_name, obj, object_to_copy_from, fine_meshes[mesh_name].blender_displacements)
else:
Mesh(obj=obj).save(output_folder / f"{mesh_name}.glb")
np.save(output_folder / f"{mesh_name}.b_displacement", fine_meshes[mesh_name].blender_displacements)
delete(obj)

def copy_materials_and_displacements(self, mesh_name, object_to_copy_to, object_to_copy_from, displacements):
mat = object_to_copy_from.data.materials[0]
object_to_copy_to.data.materials.append(mat)
mesh_name_unapplied = mesh_name
if mesh_name + "_unapplied" in bpy.data.objects.keys():
mesh_name_unapplied = mesh_name + "_unapplied"
for mod_name in displacements:
move_modifier(object_to_copy_to, bpy.data.objects[mesh_name_unapplied].modifiers[mod_name])
object_to_copy_from.hide_render = True
object_to_copy_from.hide_viewport = True
if mesh_name in hidden_in_viewport:
object_to_copy_to.hide_viewport = True

def load_glb(self, output_folder):
for mesh_name in os.listdir(output_folder):
if not mesh_name.endswith(".glb"): continue
mesh_name = mesh_name[:-4]
object_to_copy_to = Mesh(path=output_folder/f"{mesh_name}.glb").export_blender(mesh_name + "_fine")

object_to_copy_from = bpy.data.objects[mesh_name]
mat = object_to_copy_from.data.materials[0]
object_to_copy_to.data.materials.append(mat)
mesh_name_unapplied = mesh_name
if mesh_name + "_unapplied" in bpy.data.objects.keys():
mesh_name_unapplied = mesh_name + "_unapplied"
for mod_name in np.load(output_folder / f"{mesh_name}.b_displacement.npy"):
move_modifier(object_to_copy_to, bpy.data.objects[mesh_name_unapplied].modifiers[mod_name])
object_to_copy_from.hide_render = True
object_to_copy_from.hide_viewport = True
if mesh_name in hidden_in_viewport:
object_to_copy_to.hide_viewport = True
displacements = np.load(output_folder / f"{mesh_name}.b_displacement.npy")
self.copy_materials_and_displacements(mesh_name, object_to_copy_to, object_to_copy_from, displacements)

def compute_camera_space_sdf(self, XYZ):
sdf = np.ones(len(XYZ), dtype=np.float32) * 1e9
Expand Down