diff --git a/addons/material_maker/main_window.gd b/addons/material_maker/main_window.gd index c84ae15..c84b2e8 100644 --- a/addons/material_maker/main_window.gd +++ b/addons/material_maker/main_window.gd @@ -47,7 +47,20 @@ var is_mac = false func _ready(): if OS.get_name() == "OSX": is_mac = true - + + # In HTML5 export, copy all examples to the filesystem + if OS.get_name() == "HTML5": + var dir : Directory = Directory.new() + dir.make_dir("/examples") + dir.open("res://addons/material_maker/examples/") + dir.list_dir_begin(true) + while true: + var f = dir.get_next() + if f == "": + break + if f.ends_with(".ptex"): + dir.copy("res://addons/material_maker/examples/"+f, "/examples/"+f) + # Upscale everything if the display requires it (crude hiDPI support). # This prevents UI elements from being too small on hiDPI displays. if OS.get_screen_dpi() >= 192 and OS.get_screen_size().x >= 2048: diff --git a/export_presets.cfg b/export_presets.cfg index ef10b7d..44cddc9 100644 --- a/export_presets.cfg +++ b/export_presets.cfg @@ -96,10 +96,11 @@ name="HTML5" platform="HTML5" runnable=true custom_features="" -export_filter="all_resources" +export_filter="resources" +export_files=PoolStringArray( "res://addons/material_maker/common.shader", "res://addons/material_maker/engine/gen_base.gd", "res://addons/material_maker/engine/gen_buffer.gd", "res://addons/material_maker/engine/gen_comment.gd", "res://addons/material_maker/engine/gen_context.gd", "res://addons/material_maker/engine/gen_convolution.gd", "res://addons/material_maker/engine/gen_graph.gd", "res://addons/material_maker/engine/gen_image.gd", "res://addons/material_maker/engine/gen_ios.gd", "res://addons/material_maker/engine/gen_material.gd", "res://addons/material_maker/engine/gen_remote.gd", "res://addons/material_maker/engine/gen_shader.gd", "res://addons/material_maker/engine/gen_switch.gd", "res://addons/material_maker/engine/gen_texture.gd", "res://addons/material_maker/engine/loader.gd", "res://addons/material_maker/engine/renderer.gd", "res://addons/material_maker/engine/renderer.tscn", "res://addons/material_maker/environment.gd", "res://addons/material_maker/fonts/hack.ttf", "res://addons/material_maker/graph_edit.gd", "res://addons/material_maker/graph_edit.tscn", "res://addons/material_maker/icons/icon.png", "res://addons/material_maker/icons/icons.svg", "res://addons/material_maker/icons/link.tres", "res://addons/material_maker/icons/remove.tres", "res://addons/material_maker/library.gd", "res://addons/material_maker/library.tscn", "res://addons/material_maker/library/base/basketweave.png", "res://addons/material_maker/library/base/blend.png", "res://addons/material_maker/library/base/bricks.png", "res://addons/material_maker/library/base/checkerboard.png", "res://addons/material_maker/library/base/colorize.png", "res://addons/material_maker/library/base/curved_star.png", "res://addons/material_maker/library/base/herringbone.png", "res://addons/material_maker/library/base/invert.png", "res://addons/material_maker/library/base/kaleidoscope.png", "res://addons/material_maker/library/base/mirror.png", "res://addons/material_maker/library/base/noise.png", "res://addons/material_maker/library/base/normal_map.png", "res://addons/material_maker/library/base/pattern.png", "res://addons/material_maker/library/base/perlin.png", "res://addons/material_maker/library/base/polygon.png", "res://addons/material_maker/library/base/rainbow.png", "res://addons/material_maker/library/base/rays.png", "res://addons/material_maker/library/base/runes.png", "res://addons/material_maker/library/base/spanishbond.png", "res://addons/material_maker/library/base/star.png", "res://addons/material_maker/library/base/tiles.png", "res://addons/material_maker/library/base/transform.png", "res://addons/material_maker/library/base/truchet.png", "res://addons/material_maker/library/base/voronoi.png", "res://addons/material_maker/library/base/warp.png", "res://addons/material_maker/library/base/weave.png", "res://addons/material_maker/library_tree.gd", "res://addons/material_maker/main_window.gd", "res://addons/material_maker/main_window.tscn", "res://addons/material_maker/node_factory.gd", "res://addons/material_maker/nodes/comment.gd", "res://addons/material_maker/nodes/comment.tscn", "res://addons/material_maker/nodes/edit_buttons.gd", "res://addons/material_maker/nodes/edit_buttons.tscn", "res://addons/material_maker/nodes/generic.gd", "res://addons/material_maker/nodes/generic.tscn", "res://addons/material_maker/nodes/image.gd", "res://addons/material_maker/nodes/image.tscn", "res://addons/material_maker/nodes/image/godot_logo.png", "res://addons/material_maker/nodes/remote.gd", "res://addons/material_maker/nodes/remote.tscn", "res://addons/material_maker/panoramas/epping_forest_01.hdr", "res://addons/material_maker/panoramas/moonless_golf.hdr", "res://addons/material_maker/plugin.gd", "res://addons/material_maker/preview.gd", "res://addons/material_maker/preview.tscn", "res://addons/material_maker/preview_3d.tscn", "res://addons/material_maker/preview_light.gd", "res://addons/material_maker/preview_light.tscn", "res://addons/material_maker/preview_objects.tscn", "res://addons/material_maker/types/gradient.gd", "res://addons/material_maker/types/types.gd", "res://addons/material_maker/widgets/about.gd", "res://addons/material_maker/widgets/about.tscn", "res://addons/material_maker/widgets/facebook.png", "res://addons/material_maker/widgets/github.png", "res://addons/material_maker/widgets/gradient_editor.gd", "res://addons/material_maker/widgets/gradient_editor.tscn", "res://addons/material_maker/widgets/gradient_popup.gd", "res://addons/material_maker/widgets/gradient_popup.tscn", "res://addons/material_maker/widgets/hslider.gd", "res://addons/material_maker/widgets/hslider.tscn", "res://addons/material_maker/widgets/icon.png", "res://addons/material_maker/widgets/line_dialog.gd", "res://addons/material_maker/widgets/line_dialog.tscn", "res://addons/material_maker/widgets/linked_widgets/editable_label.gd", "res://addons/material_maker/widgets/linked_widgets/editable_label.tscn", "res://addons/material_maker/widgets/linked_widgets/link.gd", "res://addons/material_maker/widgets/node_editor.tscn", "res://addons/material_maker/widgets/node_editor/enum_editor.gd", "res://addons/material_maker/widgets/node_editor/enum_editor.tscn", "res://addons/material_maker/widgets/node_editor/input.gd", "res://addons/material_maker/widgets/node_editor/input.tscn", "res://addons/material_maker/widgets/node_editor/node_editor.gd", "res://addons/material_maker/widgets/node_editor/node_editor.tscn", "res://addons/material_maker/widgets/node_editor/output.gd", "res://addons/material_maker/widgets/node_editor/output.tscn", "res://addons/material_maker/widgets/node_editor/parameter.gd", "res://addons/material_maker/widgets/node_editor/parameter.tscn", "res://addons/material_maker/widgets/node_editor/parameter_boolean.gd", "res://addons/material_maker/widgets/node_editor/parameter_boolean.tscn", "res://addons/material_maker/widgets/node_editor/parameter_color.gd", "res://addons/material_maker/widgets/node_editor/parameter_color.tscn", "res://addons/material_maker/widgets/node_editor/parameter_enum.gd", "res://addons/material_maker/widgets/node_editor/parameter_enum.tscn", "res://addons/material_maker/widgets/node_editor/parameter_float.gd", "res://addons/material_maker/widgets/node_editor/parameter_float.tscn", "res://addons/material_maker/widgets/node_editor/parameter_gradient.gd", "res://addons/material_maker/widgets/node_editor/parameter_gradient.tscn", "res://addons/material_maker/widgets/node_editor/parameter_size.gd", "res://addons/material_maker/widgets/node_editor/parameter_size.tscn", "res://addons/material_maker/widgets/preview_button.tscn", "res://addons/material_maker/widgets/tabs.gd", "res://addons/material_maker/widgets/text_dialog.gd", "res://addons/material_maker/widgets/text_dialog.tscn", "res://addons/material_maker/widgets/twitter.png", "res://addons/material_maker/widgets/youtube.png", "res://addons/material_maker/window_dialog.tscn", "res://default_env.tres", "res://icon.png", "res://rodz_labs_logo.png" ) include_filter="*.json,*.ptex,*.mmg" exclude_filter="" -export_path="W:/www.suescun.org/godot/mm.html" +export_path="D:/Dev/releases/material_maker/html/index.html" patch_list=PoolStringArray( ) script_export_mode=1 script_encryption_key="" diff --git a/project.godot b/project.godot index d460da0..b328d67 100644 --- a/project.godot +++ b/project.godot @@ -154,7 +154,7 @@ boot_splash/image="res://rodz_labs_logo.png" boot_splash/fullsize=false boot_splash/bg_color=Color( 0.0901961, 0.0941176, 0.141176, 1 ) config/icon="res://icon.png" -config/release="0.6" +config/release="0.7a1" [debug] @@ -169,6 +169,10 @@ window/size/width=1280 window/size/height=720 window/dpi/allow_hidpi=true +[editor_plugins] + +enabled=PoolStringArray( "material_maker" ) + [logging] file_logging/enable_file_logging=true