diff --git a/Makefile b/Makefile index 3640908..d4bf6ac 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,9 @@ export SBSARFILES = $(SBSARDESTINATION:.sbs=.sbsar) # texturesets files export TEXTURESET_FOLDER := texturesets +# texture names possible +export TEXTURES_NAMES := basecolor|normal|metallic|roughness|opacity|height + # png files folders export PNG1024_DIR := png_1024 export PNG512_DIR := png_512 @@ -25,7 +28,7 @@ export PNG256_DIR := png_256 # Blender related export BLENDFILES_FOLDER := blenderfiles/master -export BLENDEREXEC := /home/yann/Documents/3D/blender_builds/daily/blender-3.1.0-alpha+daily.c1f5d8d023c6/blender +export BLENDEREXEC := /home/yann/Documents/3D/blender_builds/daily/blender-3.1.0-alpha+daily.644eb68524b9/blender # Logo file export LOGO := logo/YKtextures.png diff --git a/Makefile_previews b/Makefile_previews index c0a8e5d..47090c9 100644 --- a/Makefile_previews +++ b/Makefile_previews @@ -19,7 +19,7 @@ $(RENDERS): $(TEXTURESET_FOLDER)/% echo "pngset :" $$pngset ;\ for file in $$pngset ;\ do basename=$$(basename "$$file");\ - newname=$$(echo $$basename | sed -r 's/.*_[0-9]{2}_(.*)/\\\1/' | sed -r 's/\\//');\ + newname=$$(echo $$basename | sed -r 's/.*($(TEXTURES_NAMES))/\\\1/' | sed -r 's/\\//');\ mkdir --parents blenderfiles/textures;\ echo "Copying "$$file ;\ cp $$file blenderfiles/textures/$$newname ; done ;\ @@ -44,3 +44,5 @@ $(RENDERS): $(TEXTURESET_FOLDER)/% done # Clean the subfolder with temp textures @ rm -Rf blenderfiles/textures +# Clean the temp render folder + @ rm -Rf render diff --git a/README.md b/README.md index dacdd30..152cdd0 100644 --- a/README.md +++ b/README.md @@ -26,6 +26,10 @@ You must write down also the place where the script will write the generated sbs You can leave the folder indicated here, as it will be used only internally by the script to check the texturesets it handles. +# Texture names possible + +This variable is needed to recognize the files created as bitmaps from the substance source, it must include all the identifiers used in all the graphs, separated by a pipe and no space. It is used as regexp rule in the script. + ## Png files folders Theses are the places where the script will generate the final png files. It will be the main repository used as reference to fill hereafter all the targets needed in any package needed.