diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2024-11-14 19:35:45 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2024-11-14 19:35:45 +0100 |
| commit | df5520aa2dae5b3ce7abf8733dcdd152898af163 (patch) | |
| tree | 00d3047bfb14f682bfb5a21010c731ed649bfed7 /app/bin/cjoin.h | |
| parent | df247efec654e512242e4f4f1b0212034f9e01fe (diff) | |
| parent | ec3c0f6f6e7153fa797dc57a0e95779cbc63a23b (diff) | |
Merge branch 'release/debian/1_5.3.0GA-1'debian/1_5.3.0GA-1
Diffstat (limited to 'app/bin/cjoin.h')
| -rw-r--r-- | app/bin/cjoin.h | 30 |
1 files changed, 17 insertions, 13 deletions
diff --git a/app/bin/cjoin.h b/app/bin/cjoin.h index 8d9c7e3..710cb72 100644 --- a/app/bin/cjoin.h +++ b/app/bin/cjoin.h @@ -16,38 +16,42 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #ifndef HAVE_CJOIN_H #define HAVE_CJOIN_H #include "common.h" -#include "wlib.h" -#include "track.h" #define E_NOTREQ (0) #define E_REQ (1) #define E_ERROR (2) typedef struct { - DIST_T x; - DIST_T r0, r1; - DIST_T l0, l1; - DIST_T d0, d1; - BOOL_T flip, negate, Scurve; - } easementData_t; + DIST_T x; + DIST_T r0, r1; + DIST_T l0, l1; + DIST_T d0, d1; + BOOL_T flip, negate, Scurve; +} easementData_t; extern DIST_T easementVal; extern DIST_T easeR; extern DIST_T easeL; STATUS_T ComputeJoint( DIST_T, DIST_T, easementData_t * ); -BOOL_T JoinTracks( track_p, EPINX_T, coOrd, track_p, EPINX_T, coOrd, easementData_t * ); +BOOL_T JoinTracks( track_p, EPINX_T, coOrd, track_p, EPINX_T, coOrd, + easementData_t * ); void UndoJoint( track_p, EPINX_T, track_p, EPINX_T ); -void DrawJointTrack( drawCmd_p, coOrd, ANGLE_T, DIST_T, DIST_T, DIST_T, DIST_T, BOOL_T, BOOL_T, BOOL_T, track_p, EPINX_T, EPINX_T, DIST_T, wDrawColor, long ); -DIST_T JointDistance( coOrd *, coOrd, ANGLE_T, DIST_T, DIST_T, DIST_T, DIST_T, BOOL_T, BOOL_T ); -coOrd GetJointSegEndPos( coOrd, ANGLE_T, DIST_T, DIST_T, DIST_T, DIST_T, BOOL_T, BOOL_T, BOOL_T, EPINX_T, ANGLE_T * ); +void DrawJointTrack( drawCmd_p, coOrd, ANGLE_T, DIST_T, DIST_T, DIST_T, DIST_T, + BOOL_T, BOOL_T, BOOL_T, track_p, EPINX_T, EPINX_T, DIST_T, wDrawColor, long ); +DIST_T JointDistance( coOrd *, coOrd, ANGLE_T, DIST_T, DIST_T, DIST_T, DIST_T, + BOOL_T, BOOL_T ); +coOrd GetJointSegEndPos( coOrd, ANGLE_T, DIST_T, DIST_T, DIST_T, DIST_T, BOOL_T, + BOOL_T, BOOL_T, EPINX_T, ANGLE_T * ); +DIST_T JointDescriptionDistance(coOrd pos, track_p trk, coOrd * dpos, + BOOL_T show_hidden, BOOL_T * hidden); #endif // !HAVE_CJOIN_H |