Relintai/material-maker
1
0
Fork 0
mirror of https://github.com/Relintai/material-maker.git synced 2025-02-02 23:15:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated release number and export settings, and added support for .ptex file on the command line

Browse Source
This commit is contained in:
RodZill4 2020-02-19 08:31:49 +01:00
parent 88340b5502
commit 6883561beb
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
export_presets.cfg
View File

File diff suppressed because one or more lines are too long

2
material_maker/main_window.gd
View File

@ -125,6 +125,8 @@ func _ready() -> void:
m.connect("about_to_show", self, "menu_about_to_show", [ m.name, menu ]) m.connect("about_to_show", self, "menu_about_to_show", [ m.name, menu ])
new_material() new_material()
do_load_materials(OS.get_cmdline_args())
func _input(event: InputEvent) -> void: func _input(event: InputEvent) -> void:
if event.is_action_pressed("toggle_fullscreen"): if event.is_action_pressed("toggle_fullscreen"):
OS.window_fullscreen = !OS.window_fullscreen OS.window_fullscreen = !OS.window_fullscreen

2
project.godot
View File

@ -180,7 +180,7 @@ boot_splash/fullsize=false
boot_splash/bg_color=Color( 0.0901961, 0.0941176, 0.141176, 1 ) boot_splash/bg_color=Color( 0.0901961, 0.0941176, 0.141176, 1 )
config/icon="res://icon.png" config/icon="res://icon.png"
config/windows_native_icon="res://icon.ico" config/windows_native_icon="res://icon.ico"
config/release="0.8" config/release="0.9"
[autoload] [autoload]

4
start.gd
View File

@ -8,6 +8,7 @@ func _ready():
var path : String var path : String
if Directory.new().file_exists("res://material_maker/main_window.tscn"): if Directory.new().file_exists("res://material_maker/main_window.tscn"):
path = "res://material_maker/main_window.tscn" path = "res://material_maker/main_window.tscn"
else: else:
path = "res://demo/demo.tscn" path = "res://demo/demo.tscn"
loader = ResourceLoader.load_interactive(path) loader = ResourceLoader.load_interactive(path)
@ -19,7 +20,8 @@ func _process(_delta):
var err = loader.poll() var err = loader.poll()
if err == ERR_FILE_EOF: if err == ERR_FILE_EOF:
var resource = loader.get_resource() var resource = loader.get_resource()
get_node("/root").add_child(resource.instance()) var scene = resource.instance()
get_node("/root").add_child(scene)
queue_free() queue_free()
elif err == OK: elif err == OK:
var progress = float(loader.get_stage()) / loader.get_stage_count() var progress = float(loader.get_stage()) / loader.get_stage_count()