Skip to content

Commit

Permalink
Merge branch 'main' of https://github.com/PrismPipeline/QuiltiX into …
Browse files Browse the repository at this point in the history 
…adjust_readme_and_package
  • Loading branch information
@manuelkoester
manuelkoester committed Aug 1, 2023
2 parents b442e6c + 407f3ba commit e2085ab
Show file tree
Hide file tree
Showing 25 changed files with 78 additions and 374 deletions.
4 changes: 1 addition & 3 deletions src/QuiltiX/quiltix.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,7 @@ def load_default_graph(self):
ROOT,
"resources",
"materials",
"Tiles_Black_Long_Variative_1k_8b",
"Tiles_Black_Long_Variative.mtlx",
"standard_surface.mtlx"
)
if not os.path.exists(mx_file):
return
Expand All @@ -95,7 +94,6 @@ def load_default_graph(self):

def load_shaderball(self):
stage_file = os.path.join(ROOT, "resources", "geometry", "matx_shaderball_uv.usdc")
# stage_file = os.path.join(ROOT, "resources", "geometry", "StandardShaderBall", "layers", "shaderball.usda")
stage = usd_stage.get_stage_from_file(stage_file)
self.stage_ctrl.set_stage(stage)

Expand Down
5 changes: 0 additions & 5 deletions src/QuiltiX/qx_nodegraph.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -641,11 +641,6 @@ def get_mx_xml_data_from_graph(self):
self.widget.parent().validate(mx_graph_doc, popup=False)
xml_data = mx.writeToXmlString(mx_graph_doc)

# path = r"D:\tmp\2610\04_Resources\Libraries\GPU_Open\Bark_Pine_1k_8b\Bark_Pine.mtlx"
# with open(path, "r") as f:
# xml_data = f.read()
# xml_data = xml_data.replace("\"textures/", "\"D:/tmp/2610/04_Resources/Libraries/GPU_Open/Bark_Pine_1k_8b/textures/")

return xml_data

def update_mx_xml_data_from_graph(self):
Expand Down
Binary file added src/QuiltiX/resources/hdris/boiler_room_1k.exr
View file
Binary file not shown.
Binary file removed ...erials/Circle_Marble_Pattern_1k_8b/textures/Circle_Marble_Pattern_baseColor.png
View file
Binary file not shown.
Binary file removed ...s/materials/Circle_Marble_Pattern_1k_8b/textures/Circle_Marble_Pattern_mask.png
View file
Binary file not shown.
Binary file removed ...materials/Circle_Marble_Pattern_1k_8b/textures/Circle_Marble_Pattern_normal.png
View file
Binary file not shown.
125 changes: 71 additions & 54 deletions ..._Pattern_1k_8b/Circle_Marble_Pattern.mtlx → ...aterials/Copper_Old_1k_8b/Copper_Old.mtlx
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version='1.0' encoding='utf-8'?>
<materialx version="1.38">
<nodegraph name="NG_Circle_Marble_Pattern">
<output name="base_color_output" type="color3" nodename="node_image_color3_0" />
<output name="metalness_output" type="float" nodename="node_extract_1" />
<output name="specular_roughness_output" type="float" nodename="node_mix_2" />
<nodegraph name="NG_Copper_Old">
<output name="base_color_output" type="color3" nodename="node_mix_0" />
<output name="metalness_output" type="float" nodename="node_float_1" />
<output name="specular_roughness_output" type="float" nodename="node_image_float_2" />
<normal name="onthefly_3" type="vector3">
<input name="space" type="string" value="world" />
</normal>
Expand All @@ -13,9 +13,36 @@
<input name="space" type="string" value="world" />
</tangent>
<output name="tangent_output" type="vector3" nodename="onthefly_5" />
<image name="node_image_color3_0" type="color3" GLSLFX_usage="baseColor" expose="true">
<input name="texcoord" type="vector2" nodename="node_multiply_6" />
<input name="file" type="filename" colorspace="srgb_texture" value="textures/Circle_Marble_Pattern_baseColor.png" />
<texcoord name="node_texcoord_vector2_6" type="vector2">
<input name="index" type="integer" value="0" />
</texcoord>
<image name="node_image_vector3_7" type="vector3" GLSLFX_usage="normal" expose="true">
<input name="texcoord" type="vector2" nodename="node_multiply_8" />
<input name="file" type="filename" value="textures/Copper_Old_normal.png" />
<input name="layer" type="string" value="" />
<input name="default" type="vector3" value=" 0.000000, 0.000000, 0.000000" />
<input name="uaddressmode" type="string" value="periodic" />
<input name="vaddressmode" type="string" value="periodic" />
<input name="filtertype" type="string" value="linear" />
<input name="framerange" type="string" value="" />
<input name="frameoffset" type="integer" value="0" />
<input name="frameendaction" type="string" value="constant" />
</image>
<image name="node_image_float_2" type="float" GLSLFX_usage="roughness" expose="true">
<input name="texcoord" type="vector2" nodename="node_multiply_8" />
<input name="file" type="filename" value="textures/Copper_Old_roughness.png" />
<input name="layer" type="string" value="" />
<input name="default" type="float" value="0.0" />
<input name="uaddressmode" type="string" value="periodic" />
<input name="vaddressmode" type="string" value="periodic" />
<input name="filtertype" type="string" value="linear" />
<input name="framerange" type="string" value="" />
<input name="frameoffset" type="integer" value="0" />
<input name="frameendaction" type="string" value="constant" />
</image>
<image name="node_image_color3_9" type="color3" GLSLFX_usage="baseColor" expose="true">
<input name="texcoord" type="vector2" nodename="node_multiply_8" />
<input name="file" type="filename" colorspace="srgb_texture" value="textures/Copper_Old_baseColor.png" />
<input name="layer" type="string" value="" />
<input name="default" type="color3" value=" 0.000000, 0.000000, 0.000000" />
<input name="uaddressmode" type="string" value="periodic" />
Expand All @@ -25,16 +52,13 @@
<input name="frameoffset" type="integer" value="0" />
<input name="frameendaction" type="string" value="constant" />
</image>
<texcoord name="node_texcoord_vector2_7" type="vector2">
<input name="index" type="integer" value="0" />
</texcoord>
<multiply name="node_multiply_6" type="vector2">
<input name="in1" type="vector2" nodename="node_texcoord_vector2_7" />
<input name="in2" type="vector2" nodename="UVScale_2" />
<multiply name="node_multiply_8" type="vector2">
<input name="in1" type="vector2" nodename="node_texcoord_vector2_6" />
<input name="in2" type="float" nodename="Base_scale" />
</multiply>
<image name="node_image_vector3_8" type="vector3" GLSLFX_usage="normal" expose="true">
<input name="texcoord" type="vector2" nodename="node_multiply_6" />
<input name="file" type="filename" value="textures/Circle_Marble_Pattern_normal.png" />
<image name="node_image_vector3_10" type="vector3" GLSLFX_usage="bump" expose="true">
<input name="texcoord" type="vector2" nodename="node_multiply_8" />
<input name="file" type="filename" value="textures/Copper_Old_bump.png" />
<input name="layer" type="string" value="" />
<input name="default" type="vector3" value=" 0.000000, 0.000000, 0.000000" />
<input name="uaddressmode" type="string" value="periodic" />
Expand All @@ -45,55 +69,48 @@
<input name="frameendaction" type="string" value="constant" />
</image>
<normalmap name="node_normalmap" type="vector3">
<input name="in" type="vector3" nodename="node_image_vector3_8" />
<input name="in" type="vector3" nodename="node_mix_11" />
</normalmap>
<image name="node_image_vector3_9" type="vector3" GLSLFX_usage="mask" expose="true">
<input name="texcoord" type="vector2" nodename="node_multiply_6" />
<input name="file" type="filename" value="textures/Circle_Marble_Pattern_mask.png" />
<mix name="node_mix_11" type="vector3">
<input name="fg" type="vector3" nodename="node_image_vector3_10" />
<input name="bg" type="vector3" nodename="node_image_vector3_7" />
<input name="mix" type="float" nodename="Dents" />
</mix>
<constant name="node_float_1" type="float">
<input name="value" type="float" value="1.0" />
</constant>
<mix name="node_mix_0" type="color3">
<input name="fg" type="color3" nodename="node_image_color3_12" />
<input name="bg" type="color3" nodename="node_image_color3_9" />
<input name="mix" type="float" nodename="Dents" />
</mix>
<image name="node_image_color3_12" type="color3" GLSLFX_usage="diffuse" expose="true">
<input name="texcoord" type="vector2" nodename="node_multiply_8" />
<input name="file" type="filename" colorspace="srgb_texture" value="textures/Copper_Old_diffuse.png" />
<input name="layer" type="string" value="" />
<input name="default" type="vector3" value=" 0.000000, 0.000000, 0.000000" />
<input name="default" type="color3" value=" 0.000000, 0.000000, 0.000000" />
<input name="uaddressmode" type="string" value="periodic" />
<input name="vaddressmode" type="string" value="periodic" />
<input name="filtertype" type="string" value="linear" />
<input name="framerange" type="string" value="" />
<input name="frameoffset" type="integer" value="0" />
<input name="frameendaction" type="string" value="constant" />
</image>
<extract name="node_extract_10" type="float">
<input name="in" type="vector3" nodename="node_image_vector3_9" />
<input name="index" type="integer" value="0" />
</extract>
<extract name="node_extract_11" type="float">
<input name="in" type="vector3" nodename="node_image_vector3_9" />
<input name="index" type="integer" value="1" />
</extract>
<extract name="node_extract_1" type="float">
<input name="in" type="vector3" nodename="node_image_vector3_9" />
<input name="index" type="integer" value="2" />
</extract>
<mix name="node_mix_2" type="float">
<input name="fg" type="float" nodename="RoughnessHigh" />
<input name="bg" type="float" nodename="RoughnessLow" />
<input name="mix" type="float" nodename="node_extract_11" />
</mix>
<constant name="UVScale_2" type="vector2">
<input name="value" type="vector2" value=" 1.000000, 1.000000" />
</constant>
<constant name="RoughnessHigh" type="float">
<input name="value" type="float" value="1.0" />
<constant name="Base_scale" type="float">
<input name="value" type="float" value="8.0" />
</constant>
<constant name="RoughnessLow" type="float">
<input name="value" type="float" value="0.07000000029802322" />
<constant name="Dents" type="float">
<input name="value" type="float" value="0.23600001633167267" />
</constant>
</nodegraph>
<standard_surface name="SR_Circle_Marble_Pattern" type="surfaceshader">
<standard_surface name="SR_Copper_Old" type="surfaceshader">
<input name="base" type="float" value="0.800000011920929" />
<input name="base_color" type="color3" output="base_color_output" nodegraph="NG_Circle_Marble_Pattern" />
<input name="base_color" type="color3" output="base_color_output" nodegraph="NG_Copper_Old" />
<input name="diffuse_roughness" type="float" value="0.0" />
<input name="metalness" type="float" output="metalness_output" nodegraph="NG_Circle_Marble_Pattern" />
<input name="metalness" type="float" output="metalness_output" nodegraph="NG_Copper_Old" />
<input name="specular" type="float" value="1.0" />
<input name="specular_color" type="color3" value=" 1.000000, 1.000000, 1.000000" />
<input name="specular_roughness" type="float" output="specular_roughness_output" nodegraph="NG_Circle_Marble_Pattern" />
<input name="specular_roughness" type="float" output="specular_roughness_output" nodegraph="NG_Copper_Old" />
<input name="specular_IOR" type="float" value="1.5" />
<input name="specular_anisotropy" type="float" value="0.0" />
<input name="specular_rotation" type="float" value="0.0" />
Expand All @@ -118,7 +135,7 @@
<input name="coat_anisotropy" type="float" value="0.0" />
<input name="coat_rotation" type="float" value="0.0" />
<input name="coat_IOR" type="float" value="1.5" />
<input name="coat_normal" type="vector3" output="coat_normal_output" nodegraph="NG_Circle_Marble_Pattern" />
<input name="coat_normal" type="vector3" output="coat_normal_output" nodegraph="NG_Copper_Old" />
<input name="coat_affect_color" type="float" value="0.0" />
<input name="coat_affect_roughness" type="float" value="0.0" />
<input name="thin_film_thickness" type="float" value="0.0" />
Expand All @@ -127,10 +144,10 @@
<input name="emission_color" type="color3" value=" 1.000000, 1.000000, 1.000000" />
<input name="opacity" type="color3" value=" 1.000000, 1.000000, 1.000000" />
<input name="thin_walled" type="boolean" value="false" />
<input name="normal" type="vector3" output="normal_output" nodegraph="NG_Circle_Marble_Pattern" />
<input name="tangent" type="vector3" output="tangent_output" nodegraph="NG_Circle_Marble_Pattern" />
<input name="normal" type="vector3" output="normal_output" nodegraph="NG_Copper_Old" />
<input name="tangent" type="vector3" output="tangent_output" nodegraph="NG_Copper_Old" />
</standard_surface>
<surfacematerial name="Circle_Marble_Pattern" type="material">
<input name="surfaceshader" type="surfaceshader" nodename="SR_Circle_Marble_Pattern" />
<surfacematerial name="Copper_Old" type="material">
<input name="surfaceshader" type="surfaceshader" nodename="SR_Copper_Old" />
</surfacematerial>
</materialx>
Binary file added src/QuiltiX/resources/materials/Copper_Old_1k_8b/textures/Copper_Old_baseColor.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/QuiltiX/resources/materials/Copper_Old_1k_8b/textures/Copper_Old_bump.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/QuiltiX/resources/materials/Copper_Old_1k_8b/textures/Copper_Old_diffuse.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/QuiltiX/resources/materials/Copper_Old_1k_8b/textures/Copper_Old_normal.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/QuiltiX/resources/materials/Copper_Old_1k_8b/textures/Copper_Old_roughness.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit e2085ab

Please sign in to comment.