#28 fix place of blender's images and other files

ThunderFly-aerospace · Aug 1, 2023 · 1b063dc · 1b063dc
1 parent 03a8a33
commit 1b063dc
Show file tree

Hide file tree

Showing 42 changed files with 10 additions and 4,411,204 deletions.
diff --git a/.github/workflows/render_previews.yml b/.github/workflows/render_previews.yml
@@ -70,11 +70,6 @@ jobs:
         cd CAD/src/assembly
         make
 
-    - name: Make -d CAD/src/assembly (test blender)
-      run: |
-        cd CAD/src/assembly/test
-        make
-
     - name: Upload a PNG Artifact
       uses: actions/[email protected]
       with:

diff --git a/CAD/src/assembly/Makefile b/CAD/src/assembly/Makefile
@@ -1,6 +1,5 @@
 STL_DIR=../../stl
 AMF_DIR=../../amf
-IMG_DIR=png
 # FIXED: do only assembly targets
 # SRC_DIR=../../src/assembly/position
 #         must be done in itself directory
@@ -10,8 +9,10 @@ SRC_DIR=../../src/assembly
 # GCD_DIR=../../gcode
 # INI_DIR=../../slicing
 GIT_ROOT=../../../
-OUTPUT_FOLDER=.
-NAME_PREFIX=TF-G2_assembly
-PROCESSOR3D_PARAM=--no_gcode --no_amf
+OUTPUT_FOLDER=CAD
+# is taken from GIT_ROOT/OUTPUT_FOLDER
+IMG_FOLDER=../doc/assembly_guide/img
+NAME_PREFIX=TF-G2
+PROCESSOR3D_PARAM=--no_gcode --no_amf --img_folder "$(IMG_FOLDER)"
 
 include ../../../utils/Makefile
diff --git a/CAD/src/assembly/position/Makefile b/CAD/src/assembly/position/Makefile
@@ -8,7 +8,7 @@ SRC_DIR=../../../src/assembly/position
 GIT_ROOT=../../../../
 # FIXME: this is due to SRC+OUTPUT is at GIT ROOT
 OUTPUT_FOLDER=CAD
-NAME_PREFIX=TF-G2_assembly
+NAME_PREFIX=TF-G2
 PROCESSOR3D_PARAM=--no_gcode --no_amf --no_blend
 
 include ../../../../utils/Makefile
diff --git a/CAD/src/assembly/test/Makefile b/CAD/src/assembly/test/Makefile
@@ -1,14 +1,15 @@
 STL_DIR=../../../stl
 AMF_DIR=../../../amf
-IMG_DIR=png
 SRC_DIR=../../../src/assembly/test
 # DEP_DIR=../../../dep
 # GCD_DIR=../../../gcode
 # INI_DIR=../../../slicing
 GIT_ROOT=../../../../
 # FIXME: this is due to SRC+OUTPUT is at GIT ROOT
 OUTPUT_FOLDER=CAD
-NAME_PREFIX=TF-G2_assembly
-PROCESSOR3D_PARAM=--no_gcode --no_amf
+# is taken from GIT_ROOT/OUTPUT_FOLDER
+IMG_FOLDER=../doc/assembly_guide/img
+NAME_PREFIX=TF-G2
+PROCESSOR3D_PARAM=--no_gcode --no_amf --img_folder "$(IMG_FOLDER)"
 
 include ../../../../utils/Makefile
diff --git a/deps/TF-G2_assembly_assembly.dep b/deps/TF-G2_assembly_assembly.dep
diff --git a/deps/TF-G2_assembly_assembly_888_test.dep b/deps/TF-G2_assembly_assembly_888_test.dep
diff --git a/deps/TF-G2_assembly_assembly_chassi.dep b/deps/TF-G2_assembly_assembly_chassi.dep
diff --git a/deps/TF-G2_assembly_assembly_freeflap.dep b/deps/TF-G2_assembly_assembly_freeflap.dep
diff --git a/deps/TF-G2_assembly_assembly_pylon.dep b/deps/TF-G2_assembly_assembly_pylon.dep
diff --git a/deps/TF-G2_assembly_assembly_rotor_head.dep b/deps/TF-G2_assembly_assembly_rotor_head.dep
diff --git a/deps/TF-G2_assembly_assembly_rotorhead_complete.dep b/deps/TF-G2_assembly_assembly_rotorhead_complete.dep