mirror of
https://github.com/Relintai/material-maker.git
synced 2024-12-23 21:16:54 +01:00
Merge branch 'master' of https://github.com/RodZill4/godot-procedural-textures
This commit is contained in:
commit
75be7358af
@ -5,4 +5,3 @@ Its user interface is based on Godot's GraphEditor: textures are described as in
|
|||||||
More details in the [user manual](https://rodzill4.github.io/godot-procedural-textures/doc/).
|
More details in the [user manual](https://rodzill4.github.io/godot-procedural-textures/doc/).
|
||||||
|
|
||||||
![Screenshot](addons/material_maker/doc/images/screenshot.png)
|
![Screenshot](addons/material_maker/doc/images/screenshot.png)
|
||||||
|
|
||||||
|
@ -20,4 +20,3 @@ as the image generator and convolution filters (blur, emboss, normal map generat
|
|||||||
the resolution of their output.
|
the resolution of their output.
|
||||||
|
|
||||||
.. image:: images/screenshot.png
|
.. image:: images/screenshot.png
|
||||||
|
|
||||||
|
@ -5,4 +5,3 @@ The Comment node has no effect on the material and can be used to document
|
|||||||
it. Simply double-click on the contents to edit it.
|
it. Simply double-click on the contents to edit it.
|
||||||
|
|
||||||
.. image:: images/node_comment.png
|
.. image:: images/node_comment.png
|
||||||
|
|
||||||
|
@ -21,4 +21,3 @@ Parameters
|
|||||||
|
|
||||||
The Export node has a single parameter that defines the suffix PNG file
|
The Export node has a single parameter that defines the suffix PNG file
|
||||||
that will be created.
|
that will be created.
|
||||||
|
|
||||||
|
@ -50,4 +50,3 @@ The Material node provides the following parameters:
|
|||||||
* The value of the ambient occlusion property of the material. The texture used for the ambient occlusion input is multiplied by this value.
|
* The value of the ambient occlusion property of the material. The texture used for the ambient occlusion input is multiplied by this value.
|
||||||
|
|
||||||
* The value of the depth property of the material. The input depth map is multiplied by this value.
|
* The value of the depth property of the material. The input depth map is multiplied by this value.
|
||||||
|
|
||||||
|
@ -49,4 +49,3 @@ name for this configuration, and it will be added to the list.
|
|||||||
|
|
||||||
The drop-down list can be used to select a configuration, create new ones and
|
The drop-down list can be used to select a configuration, create new ones and
|
||||||
update or delete the current configuration.
|
update or delete the current configuration.
|
||||||
|
|
||||||
|
@ -23,4 +23,3 @@ Parameters
|
|||||||
The Switch node has a single parameter whose value can be 1 or 2.
|
The Switch node has a single parameter whose value can be 1 or 2.
|
||||||
When the parameter is set to 1, A forwards A1 and B forwards B1.
|
When the parameter is set to 1, A forwards A1 and B forwards B1.
|
||||||
When the parameter is set to 2, A forwards A2 and B forwards B2.
|
When the parameter is set to 2, A forwards A2 and B forwards B2.
|
||||||
|
|
||||||
|
@ -229,4 +229,3 @@ func deserialize(data : Dictionary) -> void:
|
|||||||
else:
|
else:
|
||||||
seed_locked = false
|
seed_locked = false
|
||||||
_post_load()
|
_post_load()
|
||||||
|
|
||||||
|
@ -163,6 +163,7 @@ func update_spatial_material(m, file_prefix = null) -> void:
|
|||||||
if m is SpatialMaterial:
|
if m is SpatialMaterial:
|
||||||
# Make the material double-sided for better visiblity in the preview
|
# Make the material double-sided for better visiblity in the preview
|
||||||
m.params_cull_mode = SpatialMaterial.CULL_DISABLED
|
m.params_cull_mode = SpatialMaterial.CULL_DISABLED
|
||||||
|
# Albedo
|
||||||
m.albedo_color = parameters.albedo_color
|
m.albedo_color = parameters.albedo_color
|
||||||
m.albedo_texture = get_generated_texture("albedo", file_prefix)
|
m.albedo_texture = get_generated_texture("albedo", file_prefix)
|
||||||
m.metallic = parameters.metallic
|
m.metallic = parameters.metallic
|
||||||
|
@ -27,4 +27,3 @@ func _on_TextEdit_focus_exited() -> void:
|
|||||||
generator.text = editor.text
|
generator.text = editor.text
|
||||||
label.visible = true
|
label.visible = true
|
||||||
editor.visible = false
|
editor.visible = false
|
||||||
|
|
||||||
|
@ -183,5 +183,3 @@ caret_blink = false
|
|||||||
caret_blink_speed = 0.65
|
caret_blink_speed = 0.65
|
||||||
caret_moving_by_right_click = true
|
caret_moving_by_right_click = true
|
||||||
_sections_unfolded = [ "Size Flags" ]
|
_sections_unfolded = [ "Size Flags" ]
|
||||||
|
|
||||||
|
|
||||||
|
@ -216,5 +216,3 @@ _sections_unfolded = [ "Rect" ]
|
|||||||
[connection signal="pressed" from="VBoxContainer/HBoxContainer/OK" to="." method="_on_OK_pressed"]
|
[connection signal="pressed" from="VBoxContainer/HBoxContainer/OK" to="." method="_on_OK_pressed"]
|
||||||
|
|
||||||
[connection signal="pressed" from="VBoxContainer/HBoxContainer/Cancel" to="." method="queue_free"]
|
[connection signal="pressed" from="VBoxContainer/HBoxContainer/Cancel" to="." method="queue_free"]
|
||||||
|
|
||||||
|
|
||||||
|
@ -56,4 +56,3 @@ func _on_Type_item_selected(ID) -> void:
|
|||||||
t.visible = true
|
t.visible = true
|
||||||
else:
|
else:
|
||||||
print(ID)
|
print(ID)
|
||||||
|
|
||||||
|
@ -44,5 +44,3 @@ align = 1
|
|||||||
color = Color( 1, 1, 1, 1 )
|
color = Color( 1, 1, 1, 1 )
|
||||||
edit_alpha = true
|
edit_alpha = true
|
||||||
_sections_unfolded = [ "Rect" ]
|
_sections_unfolded = [ "Rect" ]
|
||||||
|
|
||||||
|
|
||||||
|
@ -45,5 +45,3 @@ items = [ ]
|
|||||||
selected = -1
|
selected = -1
|
||||||
|
|
||||||
[connection signal="item_selected" from="EnumValues" to="." method="_on_EnumValues_item_selected"]
|
[connection signal="item_selected" from="EnumValues" to="." method="_on_EnumValues_item_selected"]
|
||||||
|
|
||||||
|
|
||||||
|
@ -143,5 +143,3 @@ _sections_unfolded = [ "Rect" ]
|
|||||||
[connection signal="pressed" from="VBoxContainer/HBoxContainer/OK" to="." method="_on_OK_pressed"]
|
[connection signal="pressed" from="VBoxContainer/HBoxContainer/OK" to="." method="_on_OK_pressed"]
|
||||||
|
|
||||||
[connection signal="pressed" from="VBoxContainer/HBoxContainer/Cancel" to="." method="queue_free"]
|
[connection signal="pressed" from="VBoxContainer/HBoxContainer/Cancel" to="." method="queue_free"]
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user