From 0c41eadc2ba97b93d6cfbaa16d8bf0a1e75597e3 Mon Sep 17 00:00:00 2001 From: "Kevin M. Rosenberg" Date: Sun, 30 Apr 2000 19:17:35 +0000 Subject: [PATCH] r24: Set up include files for conditional INTERACTIVE_GRAPHICS --- include/ct.h | 9 +++++-- include/keyboard.h | 62 ++++------------------------------------------ include/kmath.h | 10 +++++++- include/sgp.h | 46 ++++------------------------------ 4 files changed, 26 insertions(+), 101 deletions(-) diff --git a/include/ct.h b/include/ct.h index e7f29e9..deec77b 100644 --- a/include/ct.h +++ b/include/ct.h @@ -2,8 +2,11 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: ct.h,v 1.2 2000/04/28 14:14:16 kevin Exp $ +** $Id: ct.h,v 1.3 2000/04/30 19:17:35 kevin Exp $ ** $Log: ct.h,v $ +** Revision 1.3 2000/04/30 19:17:35 kevin +** Set up include files for conditional INTERACTIVE_GRAPHICS +** ** Revision 1.2 2000/04/28 14:14:16 kevin ** *** empty log message *** ** @@ -81,12 +84,14 @@ #include "kstddef.h" #include "kmath.h" -#include "sgp.h" #include "sdf.h" #include "ir.h" #include "keyboard.h" #include "cio.h" +#ifdef HAVE_INTERACTIVE_GRAPHICS #include "ezplot.h" +#include "sgp.h" +#endif #endif diff --git a/include/keyboard.h b/include/keyboard.h index ed40b82..5025e57 100644 --- a/include/keyboard.h +++ b/include/keyboard.h @@ -2,8 +2,11 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: keyboard.h,v 1.2 2000/04/28 14:14:16 kevin Exp $ +** $Id: keyboard.h,v 1.3 2000/04/30 19:17:35 kevin Exp $ ** $Log: keyboard.h,v $ +** Revision 1.3 2000/04/30 19:17:35 kevin +** Set up include files for conditional INTERACTIVE_GRAPHICS +** ** Revision 1.2 2000/04/28 14:14:16 kevin ** *** empty log message *** ** @@ -44,59 +47,4 @@ #define KEY_RETURN 13 #define KEY_ESCAPE 27 -#define KEY_HOME 0x4700 -#define KEY_UP 0x4800 -#define KEY_PGUP 0x4900 -#define KEY_LEFT 0x4B00 -#define KEY_CENTER 0x4C00 /* center of numeric keypad = 5 */ -#define KEY_RIGHT 0x4D00 -#define KEY_END 0x4F00 -#define KEY_DOWN 0x5000 -#define KEY_PGDOWN 0x5100 - -#define KEY_F1 0x3B00 -#define KEY_F2 0x3C00 -#define KEY_F3 0x3D00 -#define KEY_F4 0x3E00 -#define KEY_F5 0x3F00 -#define KEY_F6 0x4000 -#define KEY_F7 0x4100 -#define KEY_F8 0x4200 -#define KEY_F9 0x4300 -#define KEY_F10 0x4400 - -#define KEY_SHIFTF1 0x5400 -#define KEY_SHIFTF2 0x5500 -#define KEY_SHIFTF3 0x5600 -#define KEY_SHIFTF4 0x5700 -#define KEY_SHIFTF5 0x5800 -#define KEY_SHIFTF6 0x5900 -#define KEY_SHIFTF7 0x5A00 -#define KEY_SHIFTF8 0x5B00 -#define KEY_SHIFTF9 0x5C00 -#define KEY_SHIFTF10 0x5D00 - -#define KEY_CTRLF1 0x5E00 -#define KEY_CTRLF2 0x5F00 -#define KEY_CTRLF3 0x6000 -#define KEY_CTRLF4 0x6100 -#define KEY_CTRLF5 0x6200 -#define KEY_CTRLF6 0x6300 -#define KEY_CTRLF7 0x6400 -#define KEY_CTRLF8 0x6500 -#define KEY_CTRLF9 0x6600 -#define KEY_CTRLF10 0x6700 - -#define KEY_ALTF1 0x6800 -#define KEY_ALTF2 0x6900 -#define KEY_ALTF3 0x6A00 -#define KEY_ALTF4 0x6B00 -#define KEY_ALTF5 0x6C00 -#define KEY_ALTF6 0x6D00 -#define KEY_ALTF7 0x6E00 -#define KEY_ALTF8 0x6F00 -#define KEY_ALTF9 0x7000 -#define KEY_ALTF10 0x7100 - - -#endif /* #ifndef KEYBOARD_H */ +#endif diff --git a/include/kmath.h b/include/kmath.h index b7cc5fe..b3a8771 100644 --- a/include/kmath.h +++ b/include/kmath.h @@ -2,8 +2,11 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: kmath.h,v 1.3 2000/04/28 14:14:16 kevin Exp $ +** $Id: kmath.h,v 1.4 2000/04/30 19:17:35 kevin Exp $ ** $Log: kmath.h,v $ +** Revision 1.4 2000/04/30 19:17:35 kevin +** Set up include files for conditional INTERACTIVE_GRAPHICS +** ** Revision 1.3 2000/04/28 14:14:16 kevin ** *** empty log message *** ** @@ -85,6 +88,9 @@ typedef double *DMTX_1D; typedef DMTX_1D *DMTX_2D; typedef DMTX_2D *DMTX_3D; +typedef double GRFMTX_2D[3][3]; +typedef double GRFMTX_3D[4][4]; + union elem_val_un { /* holds an element value */ char c; int i; @@ -162,6 +168,8 @@ typedef struct matrix_st *MTXP; */ +/* cliprect.c */ +int cliprect(double *x1, double *y1, double *x2, double *y2, const double rect[4]); /* lnearest.c */ long int lnearest(double x); /* mtx_disp.c */ diff --git a/include/sgp.h b/include/sgp.h index 6db81b0..e6a9305 100644 --- a/include/sgp.h +++ b/include/sgp.h @@ -2,8 +2,11 @@ ** This is part of the CTSim program ** Copyright (C) 1983-2000 Kevin Rosenberg ** -** $Id: sgp.h,v 1.3 2000/04/28 18:35:21 kevin Exp $ +** $Id: sgp.h,v 1.4 2000/04/30 19:17:35 kevin Exp $ ** $Log: sgp.h,v $ +** Revision 1.4 2000/04/30 19:17:35 kevin +** Set up include files for conditional INTERACTIVE_GRAPHICS +** ** Revision 1.3 2000/04/28 18:35:21 kevin ** removed unused files ** @@ -32,6 +35,7 @@ #define __H_SGP #include "kstddef.h" +#include "kmath.h" /* device names */ @@ -176,15 +180,10 @@ typedef struct raster_st RASTER; /*-------------------------------------------------------------------------*/ -typedef double GRFMTX_2D[3][3]; -typedef double GRFMTX_3D[4][4]; - /* circle.c */ void circle(const double r); void drawarc(double start, double stop, const double r); -/* cliprect.c */ -int cliprect(double *x1, double *y1, double *x2, double *y2, const double rect[4]); /* ctm.c */ int ctm_xlat_pre_2(double x, double y); int ctm_xlat_post_2(double x, double y); @@ -204,41 +203,6 @@ int invert_gmtx_2(GRFMTX_2D a, GRFMTX_2D b); double determ_gmtx_2(GRFMTX_2D a); /* drawbox.c */ int drawbox(double xmin, double ymin, double xmax, double ymax); -/* gp.c */ -int gptrace(int state); -int viewprt3(double xmin, double ymin, double zmin, double xmax, double ymax, double zmax); -int window3(double xmin, double ymin, double xmax, double ymax); -int setproj(int pr, double x, double y, double z); -int setvrp(double x, double y, double z); -int setvpn(double x, double y, double z); -int setvup(double x, double y, double z); -int viewdepth(double front, double back); -int gpfrontclip(int on_off); -int gpbackclip(int on_off); -int calcnper(void); -int calcnpar(void); -int calcrot(double rot[5][5]); -int calcpertrans(void); -int calcpartrans(void); -int matident(double mtx[5][5]); -int matmult(double premtx[5][5], double postmtx[5][5], double result[5][5]); -int crossprod(struct point *v, struct point *w, struct point *result); -int transform(double mtx[5][5], double *x, double *y, double *z); -int homotrans(double mtx[5][5], double *x, double *y, double *z, double *w); -int moveabs3(double x, double y, double z); -int moverel3(double xr, double yr, double zr); -int lineabs3(double x, double y, double z); -int linerel3(double xr, double yr, double zr); -int drawline(double xinput, double yinput, double zinput); -int mastertondc(double *x, double *y, double *z); -int checkchange(void); -int initgrf3(void); -int termgrf3(void); -int matwrite(double mtx[5][5]); -int pyr_edge(double x, double y, double z, int *pos); -int clippyramid(double *x1, double *y1, double *z1, double *x2, double *y2, double *z2, int *accept); -int cube_edge(double x, double y, double z, int *pos); -int clipcube(double *x1, double *y1, double *z1, double *x2, double *y2, double *z2, int *accept); /* sgp.c */ int gp_init_2(void); int window2(double xmin, double ymin, double xmax, double ymax); -- 2.34.1