From 9d6cd597c6c7c50812d2357e943a18f8405c0a84 Mon Sep 17 00:00:00 2001 From: yannk Date: Tue, 21 Dec 2021 23:41:15 +0100 Subject: [PATCH 1/2] RENDER_LIST properly builds list of preview renders to process, without extension nor path --- Makefile_previews | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/Makefile_previews b/Makefile_previews index 61f4499..611f7f8 100644 --- a/Makefile_previews +++ b/Makefile_previews @@ -1,4 +1,12 @@ TEXTURESETS := $(foreach file, $(TEXTURESET_FOLDER), $(basename $(notdir $(wildcard $(TEXTURESET_FOLDER)/*)))) + + +RENDER_FOLDER = $(shell cat $(MATERIALLIST) | jq -r --arg folder "$(SET)" '.[] | select(.name==$$folder) | .type') + +RENDER_FILES = $(foreach RENDER, $(basename $(notdir $(wildcard $(BLENDFILES_FOLDER)/$(shell cat $(MATERIALLIST) | jq -r --arg folder "$(SET)" '.[] | select(.name==$$folder) | .type')/*.blend))), $(SET)_$(RENDER)) +RENDER_LIST := $(foreach SET, $(TEXTURESETS), $(RENDER_FILES)) + + BLENDFILES := $(foreach file, $(BLENDFILES_FOLDER)/master, $(basename $(notdir $(wildcard $(BLENDFILES_FOLDER)/master/*.blend)))) BLENDFILES_SUFFIX := $(foreach file, $(BLENDFILES), $(addsuffix $(file), _)) TARGET := $(foreach file, $(TEXTURESETS), $(addprefix $(file), $(BLENDFILES_SUFFIX))) @@ -9,14 +17,16 @@ RENDERS := $(foreach file, $(BLENDFILES_SUFFIX), $(addprefix %, $(file))) RENDERS := $(foreach file, $(RENDERS), $(addsuffix .png, $(file))) RENDERS := $(foreach file, $(RENDERS), $(addprefix $(PREVIEW_FOLDER)/, $(file))) -test: - echo "TARGET: $(TARGET)" - all: $(TARGET) $(RENDERS): $(TEXTURESET_FOLDER)/% + @ echo "RENDER_LIST : $(RENDER_LIST)" + @ echo "RENDER_FILES : $(RENDER_FILES)" @ echo "RENDERS :" $(RENDERS) @ echo "BLENDFILES :" $(BLENDFILES) + @ echo "BLENDFILES_SUFFIX :" $(BLENDFILES_SUFFIX) + @ echo "TARGET : $(TARGET)" + @ echo "TEXTURESETS : $(TEXTURESETS)" @ echo "Prerequisite :" $< @ pngset=`cat $<`;\ echo "pngset :" $$pngset ;\ From 6ebc0d5fd08cb4fefd76647c46c9924256f7b4ad Mon Sep 17 00:00:00 2001 From: yannk Date: Wed, 22 Dec 2021 00:16:54 +0100 Subject: [PATCH 2/2] Adding recipe variable construction for preview building - Now the previews are made according to the content of the folder named in the json file for each texture set - No more need of master blender file --- Makefile_previews | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-) diff --git a/Makefile_previews b/Makefile_previews index 611f7f8..ac8bfd6 100644 --- a/Makefile_previews +++ b/Makefile_previews @@ -1,32 +1,30 @@ TEXTURESETS := $(foreach file, $(TEXTURESET_FOLDER), $(basename $(notdir $(wildcard $(TEXTURESET_FOLDER)/*)))) - -RENDER_FOLDER = $(shell cat $(MATERIALLIST) | jq -r --arg folder "$(SET)" '.[] | select(.name==$$folder) | .type') - +# Build list of destination filenames of previews RENDER_FILES = $(foreach RENDER, $(basename $(notdir $(wildcard $(BLENDFILES_FOLDER)/$(shell cat $(MATERIALLIST) | jq -r --arg folder "$(SET)" '.[] | select(.name==$$folder) | .type')/*.blend))), $(SET)_$(RENDER)) RENDER_LIST := $(foreach SET, $(TEXTURESETS), $(RENDER_FILES)) - - -BLENDFILES := $(foreach file, $(BLENDFILES_FOLDER)/master, $(basename $(notdir $(wildcard $(BLENDFILES_FOLDER)/master/*.blend)))) -BLENDFILES_SUFFIX := $(foreach file, $(BLENDFILES), $(addsuffix $(file), _)) -TARGET := $(foreach file, $(TEXTURESETS), $(addprefix $(file), $(BLENDFILES_SUFFIX))) -TARGET := $(foreach file, $(TARGET), $(addsuffix .png, $(file))) +# Add them png suffix and destination path +TARGET := $(foreach file, $(RENDER_LIST), $(addsuffix .png, $(file))) TARGET := $(foreach file, $(TARGET), $(addprefix $(PREVIEW_FOLDER)/, $(file))) -RENDERS := $(foreach file, $(BLENDFILES_SUFFIX), $(addprefix %, $(file))) -RENDERS := $(foreach file, $(RENDERS), $(addsuffix .png, $(file))) +# Build list of corresponding recipe filenames +RECIPE_RENDERS = $(foreach RECIPE_RENDER, $(basename $(notdir $(wildcard $(BLENDFILES_FOLDER)/$(shell cat $(MATERIALLIST) | jq -r --arg folder "$(TEX_SET)" '.[] | select(.name==$$folder) | .type')/*.blend))), %_$(RECIPE_RENDER)) +RECIPE_RENDERS_LIST := $(foreach TEX_SET, $(TEXTURESETS), $(RECIPE_RENDERS)) +# Add them png suffix and destination path +RENDERS := $(foreach file, $(RECIPE_RENDERS_LIST), $(addsuffix .png, $(file))) RENDERS := $(foreach file, $(RENDERS), $(addprefix $(PREVIEW_FOLDER)/, $(file))) -all: $(TARGET) -$(RENDERS): $(TEXTURESET_FOLDER)/% +all: $(TARGET) @ echo "RENDER_LIST : $(RENDER_LIST)" @ echo "RENDER_FILES : $(RENDER_FILES)" @ echo "RENDERS :" $(RENDERS) - @ echo "BLENDFILES :" $(BLENDFILES) - @ echo "BLENDFILES_SUFFIX :" $(BLENDFILES_SUFFIX) + @ echo "RECIPE_RENDERS :" $(RECIPE_RENDERS) + @ echo "RECIPE_RENDERS_LIST :" $(RECIPE_RENDERS_LIST) @ echo "TARGET : $(TARGET)" @ echo "TEXTURESETS : $(TEXTURESETS)" + +$(RENDERS): $(TEXTURESET_FOLDER)/% @ echo "Prerequisite :" $< @ pngset=`cat $<`;\ echo "pngset :" $$pngset ;\