Relintai/material-maker
1
0
Fork 0
mirror of https://github.com/Relintai/material-maker.git synced 2024-11-13 06:27:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'export_plugin' into add-basic-hidpi-support

Browse Source
This commit is contained in:
Rodz Labs 2019-10-17 22:23:45 +02:00 committed by GitHub
commit ab9c5ddac6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/material_maker/engine/gen_switch.gd
View File

@ -13,9 +13,11 @@ func get_type_name():
return "Switch" return "Switch"
func get_parameter_defs(): func get_parameter_defs():
return [ { name="outputs", label="Outputs", type="float", min=1, max=5, step=1, default=2 }, return [
{ name="choices", label="Choices", type="float", min=2, max=5, step=1, default=2 }, { name="outputs", label="Outputs", type="float", min=1, max=5, step=1, default=2 },
{ name="source", label="Source", type="float", min=0, max=1, step=1, default=0 } ] { name="choices", label="Choices", type="float", min=2, max=5, step=1, default=2 },
{ name="source", label="Source", type="float", min=0, max=1, step=1, default=0 },
]
func get_input_defs(): func get_input_defs():
var rv : Array = [] var rv : Array = []
@ -23,7 +25,7 @@ func get_input_defs():
for o in range(parameters.outputs): for o in range(parameters.outputs):
rv.push_back({ name=PoolByteArray([64+o]).get_string_from_ascii()+str(c), type="rgba" }) rv.push_back({ name=PoolByteArray([64+o]).get_string_from_ascii()+str(c), type="rgba" })
return rv return rv
func get_output_defs(): func get_output_defs():
var rv : Array = [] var rv : Array = []
for o in range(parameters.outputs): for o in range(parameters.outputs):

4
addons/material_maker/main_window.gd
View File

@ -46,6 +46,10 @@ func _ready():
if OS.get_screen_dpi() >= 192 and OS.get_screen_size().x >= 2048: if OS.get_screen_dpi() >= 192 and OS.get_screen_size().x >= 2048:
get_tree().set_screen_stretch(SceneTree.STRETCH_MODE_DISABLED, SceneTree.STRETCH_ASPECT_IGNORE, Vector2(), 2) get_tree().set_screen_stretch(SceneTree.STRETCH_MODE_DISABLED, SceneTree.STRETCH_ASPECT_IGNORE, Vector2(), 2)
# Set a minimum window size to prevent UI elements from collapsing on each other.
# This property is only available in 3.2alpha or later, so use `set()` to fail gracefully if it doesn't exist.
OS.set("min_window_size", Vector2(1024, 600))
if !Engine.editor_hint: if !Engine.editor_hint:
OS.set_window_title(ProjectSettings.get_setting("application/config/name")+" v"+ProjectSettings.get_setting("application/config/release")) OS.set_window_title(ProjectSettings.get_setting("application/config/name")+" v"+ProjectSettings.get_setting("application/config/release"))
load_recents() load_recents()