diff --git a/CHANGES b/CHANGES index 1189b04..1201879 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,13 @@ +* v1.2 Updated help text of stl_boolean. Added more commands. + * stl_area + * stl_ascii + * stl_bcylinder + * stl_binary + * stl_cylinders + * stl_decimate + * stl_flat + * stl_volume + * stl_zero * v1.1 Fixed Makefile to properly install stl_boolean * v1.0 release with the following commands * stl_empty diff --git a/Makefile b/Makefile index b32e6ab..9dfd51d 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,7 @@ prefix?=/usr/local target=$(DESTDIR)$(prefix) -VERSION=1.1 +VERSION=1.2 DOCS_DIR := man BIN_DIR := bin CMDS := $(addprefix $(BIN_DIR)/,stl_header stl_merge stl_transform stl_count stl_bbox stl_cube stl_sphere stl_cylinder stl_cylinders stl_cone stl_torus stl_empty stl_threads stl_normals stl_convex stl_borders stl_spreadsheet stl_area stl_volume stl_bcylinder stl_binary stl_ascii stl_zero) diff --git a/src/stl_cylinders.cpp b/src/stl_cylinders.cpp index 209ec91..282d386 100644 --- a/src/stl_cylinders.cpp +++ b/src/stl_cylinders.cpp @@ -30,10 +30,14 @@ Copyright 2020 by Allwine Designs (stl_cmd@allwinedesigns.com) #define BUFFER_SIZE 4096 void print_usage() { - fprintf(stderr, "stl_cylinders outputs an STL file of a single cylinder.\n\n"); + fprintf(stderr, "stl_cylinders outputs an STL file with multiple cylinders defined by a custom binary input file.\n\n"); fprintf(stderr, "usage: stl_cylinders [ -r ] [ -s ] \n"); - fprintf(stderr, " Outputs an stl file of a cylinder with the provided radius, height and number of segments to approximate a circle.\n"); - fprintf(stderr, " If the radius or height are omitted, they default to 1. If segments is omitted, it defaults to 32. If no output file is provided, data is sent to stdout. \n"); + fprintf(stderr, " Outputs an stl file made up of N cylinders defined by start and end points in the input file each with the specified\n"); + fprintf(stderr, " radius and number of segments provided on the command line. The first 4 bytes of the input file represent how many \n"); + fprintf(stderr, " cylinders to generate, N. The rest of the input file defines start and end points that define a line segment of the\n"); + fprintf(stderr, " the central axis of the cylinder. Each segment is defined by 6, 4 byte floats. The first three are the X,Y,Z values\n"); + fprintf(stderr, " of the start point and the second three are the X,Y,Z values of the end point.\n"); + fprintf(stderr, " If the radius is omitted, it defaults to 1. If segments is omitted, it defaults to 32.\n"); } void write_cylinder(FILE *outf, const vec &pt1, const vec &pt2, float radius, int segments) { diff --git a/src/stl_zero.cpp b/src/stl_zero.cpp index 7b47a07..ebec22d 100644 --- a/src/stl_zero.cpp +++ b/src/stl_zero.cpp @@ -32,7 +32,7 @@ Copyright 2014 by Freakin' Sweet Apps, LLC (stl_cmd@freakinsweetapps.com) void print_usage() { fprintf(stderr, "stl_zero centres an STL file.\n\n"); fprintf(stderr, "usage: stl_zero [-base] [ [] ]\n"); - fprintf(stderr, " Centre an STL file around the origin. "); + fprintf(stderr, " Center an STL file around the origin. "); fprintf(stderr, " If no input file is provided, data is read from stdin. If no output file is provided, data is sent to stdout. \n"); fprintf(stderr, " -base - If this is specified, set the lowest point in the design to z = 0. \n"); }