diff --git a/assembly-guide/gifs/addMagnetsToMagnetModules.gif b/assembly-guide/gifs/addMagnetsToMagnetModules.gif index 65d2c3a..b8b135e 100644 Binary files a/assembly-guide/gifs/addMagnetsToMagnetModules.gif and b/assembly-guide/gifs/addMagnetsToMagnetModules.gif differ diff --git a/assembly-guide/gifs/addMagnetsToSideWall.gif b/assembly-guide/gifs/addMagnetsToSideWall.gif index a2d4e47..38fc350 100644 Binary files a/assembly-guide/gifs/addMagnetsToSideWall.gif and b/assembly-guide/gifs/addMagnetsToSideWall.gif differ diff --git a/assembly-guide/gifs/attachSideConnectorModulesToYBars.gif b/assembly-guide/gifs/attachSideConnectorModulesToYBars.gif index 19fb428..16a2488 100644 Binary files a/assembly-guide/gifs/attachSideConnectorModulesToYBars.gif and b/assembly-guide/gifs/attachSideConnectorModulesToYBars.gif differ diff --git a/assembly-guide/gifs/attachXBarWithYBar.gif b/assembly-guide/gifs/attachXBarWithYBar.gif index cf35508..4c4c224 100644 Binary files a/assembly-guide/gifs/attachXBarWithYBar.gif and b/assembly-guide/gifs/attachXBarWithYBar.gif differ diff --git a/assembly-guide/gifs/attachXYPlates.gif b/assembly-guide/gifs/attachXYPlates.gif index 1b98fbc..a8d3b43 100644 Binary files a/assembly-guide/gifs/attachXYPlates.gif and b/assembly-guide/gifs/attachXYPlates.gif differ diff --git a/assembly-guide/gifs/attachXYTrays.gif b/assembly-guide/gifs/attachXYTrays.gif index be18199..ac3b4d6 100644 Binary files a/assembly-guide/gifs/attachXYTrays.gif and b/assembly-guide/gifs/attachXYTrays.gif differ diff --git a/assembly-guide/gifs/connectXYTrayWithMainRails.gif b/assembly-guide/gifs/connectXYTrayWithMainRails.gif index c22e128..15118bc 100644 Binary files a/assembly-guide/gifs/connectXYTrayWithMainRails.gif and b/assembly-guide/gifs/connectXYTrayWithMainRails.gif differ diff --git a/assembly-guide/gifs/insertDowelsIntoSideWall.gif b/assembly-guide/gifs/insertDowelsIntoSideWall.gif index dfe86de..1091a08 100644 Binary files a/assembly-guide/gifs/insertDowelsIntoSideWall.gif and b/assembly-guide/gifs/insertDowelsIntoSideWall.gif differ diff --git a/assembly-guide/gifs/insertFeet.gif b/assembly-guide/gifs/insertFeet.gif index 2757a5e..379e270 100644 Binary files a/assembly-guide/gifs/insertFeet.gif and b/assembly-guide/gifs/insertFeet.gif differ diff --git a/assembly-guide/gifs/propUpBottomXYTraywithSideWalls.gif b/assembly-guide/gifs/propUpBottomXYTraywithSideWalls.gif index c1a0ce2..691f13c 100644 Binary files a/assembly-guide/gifs/propUpBottomXYTraywithSideWalls.gif and b/assembly-guide/gifs/propUpBottomXYTraywithSideWalls.gif differ diff --git a/assembly-guide/gifs/screwFeet.gif b/assembly-guide/gifs/screwFeet.gif index ea87319..c84ae2d 100644 Binary files a/assembly-guide/gifs/screwFeet.gif and b/assembly-guide/gifs/screwFeet.gif differ diff --git a/assembly-guide/gifs/screwXBarAndYBar.gif b/assembly-guide/gifs/screwXBarAndYBar.gif index 323cdeb..e35c1a2 100644 Binary files a/assembly-guide/gifs/screwXBarAndYBar.gif and b/assembly-guide/gifs/screwXBarAndYBar.gif differ diff --git a/assembly-guide/gifs/slideHexNutToFeet.gif b/assembly-guide/gifs/slideHexNutToFeet.gif index b1e35cf..8ec9da7 100644 Binary files a/assembly-guide/gifs/slideHexNutToFeet.gif and b/assembly-guide/gifs/slideHexNutToFeet.gif differ diff --git a/assembly-guide/gifs/slideHexNutsIntoYBar.gif b/assembly-guide/gifs/slideHexNutsIntoYBar.gif index 14d9911..50b9c96 100644 Binary files a/assembly-guide/gifs/slideHexNutsIntoYBar.gif and b/assembly-guide/gifs/slideHexNutsIntoYBar.gif differ diff --git a/assembly-guide/gifs/slideHexNutsIntoYBarXYPlate.gif b/assembly-guide/gifs/slideHexNutsIntoYBarXYPlate.gif index 44ae13c..26d0a70 100644 Binary files a/assembly-guide/gifs/slideHexNutsIntoYBarXYPlate.gif and b/assembly-guide/gifs/slideHexNutsIntoYBarXYPlate.gif differ diff --git a/misc/animate.sh b/misc/animate.sh index 74b159b..e0aab08 100755 --- a/misc/animate.sh +++ b/misc/animate.sh @@ -19,13 +19,12 @@ if [ -n "$3" ]; then target_dir="$3" fi -echo "Current directory: $(pwd)" - filename_without_extension="${name%.*}" # needs tomorrow night openscad theme # convert -resize 20% -delay 6 -loop 0 -transparent "#1d1f21" -dispose previous frame000*.png "$filename_without_extension".gif -convert -resize 20% -delay 6 -loop 0 -dispose previous "$png_dir"/"$filename_without_extension"000*.png "$target_dir"/"$filename_without_extension".gif +convert -delay 6 -loop 0 -dispose previous "$png_dir"/"$filename_without_extension"000*.png "$target_dir"/"$filename_without_extension".gif -gifsicle -O3 --colors=64 --scale 0.5 -i "$target_dir"/"$filename_without_extension".gif -o "$target_dir"/"$filename_without_extension".gif \ No newline at end of file +#gifsicle -O3 --colors=64 --scale 0.5 -i "$target_dir"/"$filename_without_extension".gif -o "$target_dir"/"$filename_without_extension".gif +gifsicle -O3 --colors=64 --no-warnings --scale 0.5 -i "$target_dir"/"$filename_without_extension".gif -o "$target_dir"/"$filename_without_extension".gif \ No newline at end of file diff --git a/rbuild.py b/rbuild.py index f12f601..758f34a 100644 --- a/rbuild.py +++ b/rbuild.py @@ -158,18 +158,15 @@ def build_single(build_dir, target_dir, filename, config, dz, nightly): run_openscad(openscad_args, nightly) def build_assembly_gifs(config, dz, nightly): - print('Building assembly-gifs. Source Dir:', ASSEMBLY_GIF_DIR, ', Target:', ASSEMBLY_GIF_BUILD_DIR) + print('Building assembly-gifs. Source Dir:', ASSEMBLY_GIF_DIR, '| Target:', ASSEMBLY_GIF_BUILD_DIR) for (fileName, numSteps) in ASSEMBLY_STEPS: - print('Rendering', fileName) + print('Building GIF for', fileName) openscad_args = construct_openscad_animation_args( ASSEMBLY_GIF_DIR, ASSEMBLY_GIF_TEMP_DIR, fileName, config, dz, numSteps ) run_openscad(openscad_args, nightly) - - print("Building GIF for", fileName) build_gif_from_png(fileName) - print("Done") def build_gif_from_png(fileName): script_dir = os.path.dirname(os.path.abspath(__file__))