#28 - fix paths and resolution for generated pngs from blender

ThunderFly-aerospace · Jul 31, 2023 · 1af4035 · 1af4035
1 parent f16fe16
commit 1af4035
Show file tree

Hide file tree

Showing 11 changed files with 48 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,16 @@
 *.gcode
 CAD/slicing/*.ini
 *.blend1
+
+# vim backup file
+*.swp
+
+# MKT my revers link outside from repository for notes
+notes
+notes.*
+
+# temporary files
+**tmp*
+**.tmp*
+**temp*
+**.temp*
diff --git a/CAD/src/assembly/assembly.scad b/CAD/src/assembly/assembly.scad
@@ -1,5 +1,6 @@
 // This enable generation png from blender:
 //@blender_template(../build_manual/blender/build_manual_template.blend)
+//@blender_updater=../build_manual/update_render_src.py
 include <../../parameters.scad>
 $fn=10;
 

diff --git a/CAD/src/assembly/assembly_chassi.scad b/CAD/src/assembly/assembly_chassi.scad
@@ -1,6 +1,7 @@
 
 //@set_slicing_config(../slicing/default.ini)
 //@blender_template(../build_manual/blender/build_manual_template.blend)
+//@blender_updater=../build_manual/update_render_src.py
 
 include <../../parameters.scad>
 // include <yasim.scad>

diff --git a/CAD/src/assembly/assembly_pylon.scad b/CAD/src/assembly/assembly_pylon.scad
@@ -1,4 +1,5 @@
 //@blender_template(../build_manual/blender/build_manual_template.blend)
+//@blender_updater=../build_manual/update_render_src.py
 //@set_slicing_config(../slicing/default.ini)
 include <../../parameters.scad>
 

diff --git a/CAD/src/assembly/assembly_rotor_head.scad b/CAD/src/assembly/assembly_rotor_head.scad
@@ -1,4 +1,5 @@
 //@blender_template(../build_manual/blender/build_manual_template.blend)
+//@blender_updater=../build_manual/update_render_src.py
 //@set_slicing_config(../slicing/default.ini)
 include <../../parameters.scad>
 // include <yasim.scad>

diff --git a/CAD/src/assembly/assembly_rotorhead_complete.scad b/CAD/src/assembly/assembly_rotorhead_complete.scad
@@ -1,4 +1,5 @@
 //@blender_template(../build_manual/blender/build_manual_template.blend)
+//@blender_updater=../build_manual/update_render_src.py
 include <../../parameters.scad>
 
 include <position/position_rotorhead.scad>

diff --git a/CAD/src/assembly/full_assembly.scad b/CAD/src/assembly/full_assembly.scad
@@ -1,5 +1,13 @@
 // This enable generation png from blender:
 //@blender_template(../build_manual/blender/build_manual_template.blend)
+//@blender_updater=../build_manual/update_render_src.py
+//
+// FIXME: this may fails in generation PNG from blender
+//        due to parameter in translate
+//        p3D do not understand remarks /* .. */
+// # skip processing from blender
+//@no_blend
+
 //@set_slicing_config(../slicing/default.ini)
 include <../../parameters.scad>
 

diff --git a/CAD/src/assembly/test/assembly_888_test.scad b/CAD/src/assembly/test/assembly_888_test.scad
@@ -18,7 +18,7 @@ $fn=10;
 //include <position/position_888_1002.scad> // Motorova pricka
 //include <position/position_888_1003.scad> // Bocnice
 include <../position/position_888_1006.scad> // Policka na payload
-//include <position/position_888_1007.scad> // spodni pricka pylonu
+include <../position/position_888_1007.scad> // spodni pricka pylonu
 //include <position/position_888_1008.scad> // horni pricka pylonu
 //include <position/position_888_1009.scad> // 
 //include <position/position_888_1010.scad> // TFSLOT

diff --git a/CAD/src/assembly/yasim_assembly.scad b/CAD/src/assembly/yasim_assembly.scad
@@ -1,5 +1,11 @@
 // FIXME: this may fails in generation PNG from blender
+//        due to parameter in translate
+//        p3D do not understand remarks /* .. */
+// # skip processing from blender
+//@no_blend
+//
 //@blender_template(../build_manual/blender/build_manual_template.blend)
+//@blender_updater=../build_manual/update_render_src.py
 //@set_slicing_config(../slicing/default.ini)
 include <../../parameters.scad>
 include <yasim.scad>

diff --git a/CAD/src/build_manual/update_render_src.py b/CAD/src/build_manual/update_render_src.py
@@ -34,7 +34,7 @@
 print("Cela cesta:", config_folder)
 print("Nazev konfigurace", config_name)
 
-
+# FIXME: add dep check
 
 def import_and_rename(stl, name = None):
     print("Importing file '{}' with name '{}'.".format(stl, name))
@@ -57,7 +57,15 @@ def save_blender_file(filename):
 
 def render_png(filename, frame = 0):
 	print("Rendering file")
+        # see https://docs.blender.org/api/current/bpy.types.RenderSettings.html
+        #  or https://blenderartists.org/
 	bpy.context.scene.render.filepath = filename
+	#bpy.ops.render.render(write_still=True)
+	# FIXME: set up from json
+	bpy.context.scene.render.resolution_x = 1024
+	bpy.context.scene.render.resolution_y = 1024
+	bpy.context.scene.render.fps = 1
+	bpy.context.scene.render.image_settings.compression = 100
 	bpy.ops.render.render(write_still=True)
 	print("Saving render")
 

diff --git a/utils/Makefile b/utils/Makefile
@@ -18,6 +18,8 @@ GRN=" \e[32m "
 YEL=" \e[33m "
 DEF=" \e[39m "
 
+STRICT=-
+
 all: prepare_config default finish
 
 prepare_config:
@@ -30,7 +32,7 @@ $(AMF_DIR)/%.amf: $(SRC_DIR)/%.scad
 	@echo "\n\n"
 	@echo $<
 	@echo "\n"
-	-processor3D \
+	$(STRICT)processor3D \
 		--output_folder $(GIT_ROOT)/$(OUTPUT_FOLDER) \
 		--name_prefix $(NAME_PREFIX) \
 		$(PROCESSOR3D_PARAM) $<
@@ -46,6 +48,9 @@ ifdef GCD_DIR
 LIST_TARGETS += list-targets-gcd
 endif
 
+list:
+	@echo "OUTPUT_FOLDER: $$(cd $(GIT_ROOT) ; cd $(OUTPUT_FOLDER); pwd -P)"
+
 list-targets: ${LIST_TARGETS}
 
 list-targets-amf: