public_mirrors
/
material-maker
mirror of https://github.com/RodZill4/material-maker.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixes in environment manager

This commit is contained in:
RodZill4 2021-02-14 09:59:23 +01:00
parent 1010987423
commit 5bcfbcfe32
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
material_maker/tools/environment_manager/environment_manager.gd
View File

@ -59,6 +59,8 @@ func get_environment_list() -> Array:
return list return list
func set_value(index, variable, value): func set_value(index, variable, value):
if index < 0 || index >= environments.size():
return
var serialized_value = MMType.serialize_value(value) var serialized_value = MMType.serialize_value(value)
if environments[index][variable] != serialized_value: if environments[index][variable] != serialized_value:
environments[index][variable] = serialized_value environments[index][variable] = serialized_value
@ -84,7 +86,6 @@ func apply_environment(index : int, e : Environment, s : DirectionalLight) -> vo
var status = read_hdr(index, env.hdri_url) var status = read_hdr(index, env.hdri_url)
while status is GDScriptFunctionState: while status is GDScriptFunctionState:
status = yield(status, "completed") status = yield(status, "completed")
print(status)
e.background_sky.panorama = env_textures.hdri e.background_sky.panorama = env_textures.hdri
e.set_meta("hdri", env.hdri_url) e.set_meta("hdri", env.hdri_url)
e.background_energy = env.sky_energy e.background_energy = env.sky_energy
@ -109,7 +110,6 @@ func read_hdr(index : int, url : String) -> bool:
if dir.file_exists($HTTPRequest.download_file): if dir.file_exists($HTTPRequest.download_file):
set_hdr(index, $HTTPRequest.download_file) set_hdr(index, $HTTPRequest.download_file)
else: else:
print("Downloading "+url)
var error = $HTTPRequest.request(url) var error = $HTTPRequest.request(url)
if error == OK: if error == OK:
progress_window = preload("res://material_maker/windows/progress_window/progress_window.tscn").instance() progress_window = preload("res://material_maker/windows/progress_window/progress_window.tscn").instance()
@ -175,14 +175,12 @@ onready var preview_generator : Viewport = $PreviewGenerator
func do_update_thumbnail() -> void: func do_update_thumbnail() -> void:
rendering = true rendering = true
for index in thumbnail_update_list: for index in thumbnail_update_list:
print(index)
apply_environment(index, $PreviewGenerator/CameraPosition/CameraRotation1/CameraRotation2/Camera.environment, $PreviewGenerator/Sun) apply_environment(index, $PreviewGenerator/CameraPosition/CameraRotation1/CameraRotation2/Camera.environment, $PreviewGenerator/Sun)
preview_generator.render_target_update_mode = Viewport.UPDATE_ONCE preview_generator.render_target_update_mode = Viewport.UPDATE_ONCE
preview_generator.update_worlds() preview_generator.update_worlds()
yield(get_tree(), "idle_frame") yield(get_tree(), "idle_frame")
yield(get_tree(), "idle_frame") yield(get_tree(), "idle_frame")
var t : ImageTexture = environment_textures[index].thumbnail var t : ImageTexture = environment_textures[index].thumbnail
print(t)
var image : Image = preview_generator.get_texture().get_data() var image : Image = preview_generator.get_texture().get_data()
if image != null: if image != null:
t.create_from_image(image) t.create_from_image(image)