All, This patch will get you from 4.3 to 4.4. Brad noticed a problem with the color blending used for depth cueing. Other minor fixes are included. ACM Revision 4 Patch #4 Riley Rainey APPLYING THIS PATCH: cd to the top of the source tree (the directory that contains the "src" and "V" subdirectories) and type: $ patch -p -s < PatchFilename Then rebuild everything. $ ./configure $ make Summary of fixes: Color blending repaired. Drones can be chased. Makefiles now have a "depend" target. Visibility can be set from the acms command line. *** ./README@@/V4.3 Fri Feb 4 10:28:46 1994 --- ./README Fri Mar 4 15:34:47 1994 *************** *** 1,4 **** ! ACM Flight Simulator, revision 4.3 What is ACM? --- 1,4 ---- ! ACM Flight Simulator, revision 4.4 What is ACM? *************** *** 24,30 **** Riley Rainey (rainey@netcom.com OR riley@atria.com) Dallas, Texas ! January 31, 1994 Building ACM: --- 24,30 ---- Riley Rainey (rainey@netcom.com OR riley@atria.com) Dallas, Texas ! February 14, 1994 Building ACM: *************** *** 68,73 **** --- 68,90 ---- Imakefiles have been kept for historical reasons. xmkmf should be used only as a last resort in the case that `configure' fails to work properly. + What's different with revision 4.4: + ----------------------------------- + + This is essentially a patch release for 4.3. + + Simple visual depth cueing has been added to ACM. Depth cueing is only + activated on color or grey-scale screens that have at least 8 bit planes. + Visibility can be set using the "-visibility" switch on the acms command + line. It produces interesting, if slow, results when used with any of the + Hawaiian Island scenes. I intend to improve the performance and visual + fidelity of this feature. + + A bug in the depth cueing color blending code has been fixed. + + Fixes to src/makefile.in and V/lib/Makefile.in have been applied. A + "make depend" target has been added. + What's different with revision 4.3: ----------------------------------- *************** *** 91,97 **** now the color to be used for the "ground". The kauai-scene, oahu-scene and maui-scene files display environments ! around the Hawaiian Islands. Terrain elevation data was extracted from USGS one degree Digital Elevation Model (DEM) data files. Because of the complexity of these scenes, rendering speed is unacceptably slow on all but the fastest contemporary workstations. --- 108,114 ---- now the color to be used for the "ground". The kauai-scene, oahu-scene and maui-scene files display environments ! around those Hawaiian islands. Terrain elevation data was extracted from USGS one degree Digital Elevation Model (DEM) data files. Because of the complexity of these scenes, rendering speed is unacceptably slow on all but the fastest contemporary workstations. *** ./V/lib/VBindColors.c@@/V4.3 Tue Mar 1 13:56:30 1994 --- ./V/lib/VBindColors.c Fri Mar 4 15:34:56 1994 *************** *** 215,221 **** Display *dpy = v->dpy; XColor xcolor, xcolor2, hcolor; double d; ! int i; /* * First, if we are doing any depth cueing, insure that the haze color has --- 215,222 ---- Display *dpy = v->dpy; XColor xcolor, xcolor2, hcolor; double d; ! int i, swap = 0; ! unsigned long temp; /* * First, if we are doing any depth cueing, insure that the haze color has *************** *** 222,228 **** * been converted to RGB values. */ ! if (cxt->depthCueSteps > 1 && (cxt->flags & WCDepthCueParsed) == 0) { if (v->colorTweakProc) { (*v->colorTweakProc)(v, cxt->depthCueColor->color_name, --- 223,229 ---- * been converted to RGB values. */ ! if (cxt->depthCueSteps > 1 && (v->flags & VPDepthCueParsed) == 0) { if (v->colorTweakProc) { (*v->colorTweakProc)(v, cxt->depthCueColor->color_name, *************** *** 229,252 **** realColor); } else { ! strcpy (realColor, vc->color_name); } if (XParseColor(dpy, v->cmap, ! realColor, &cxt->xdepthCueColor) == 0) { fprintf (stderr, errmsg2, cxt->depthCueColor->color_name); return -1; } ! if (XAllocColor (dpy, v->cmap, &cxt->xdepthCueColor) == 0) { fprintf (stderr, errmsg); return -1; } cxt->depthCueColor->cIndex = cxt->nextPixel; ! v->aPixel[cxt->nextPixel++] = cxt->xdepthCueColor.pixel; ! cxt->flags |= WCDepthCueParsed; } /* --- 230,255 ---- realColor); } else { ! strcpy (realColor, cxt->depthCueColor->color_name); } if (XParseColor(dpy, v->cmap, ! realColor, &hcolor) == 0) { fprintf (stderr, errmsg2, cxt->depthCueColor->color_name); return -1; } ! if (XAllocColor (dpy, v->cmap, &hcolor) == 0) { fprintf (stderr, errmsg); return -1; } cxt->depthCueColor->cIndex = cxt->nextPixel; ! v->aPixel[cxt->nextPixel++] = hcolor.pixel; ! v->xdepthCueColor = hcolor; ! v->flags |= VPDepthCueParsed; ! swap = 1; } /* *************** *** 274,280 **** else if (v->flags & VPDepthCueing && cxt->depthCueSteps > 1 && vc->flags & ColorEnableDepthCueing) { vc->cIndex = cxt->nextPixel; ! hcolor = cxt->xdepthCueColor; for (i=0; idepthCueSteps-1; ++i) { d = (double) i / (double) cxt->depthCueSteps; xcolor2.red = xcolor.red * (1.0 - d) + hcolor.red * d; --- 277,283 ---- else if (v->flags & VPDepthCueing && cxt->depthCueSteps > 1 && vc->flags & ColorEnableDepthCueing) { vc->cIndex = cxt->nextPixel; ! hcolor = v->xdepthCueColor; for (i=0; idepthCueSteps-1; ++i) { d = (double) i / (double) cxt->depthCueSteps; xcolor2.red = xcolor.red * (1.0 - d) + hcolor.red * d; *************** *** 295,300 **** --- 298,324 ---- } vc->cIndex = cxt->nextPixel; v->aPixel[cxt->nextPixel++] = xcolor.pixel; + } + + /* + * Sorry for the hack, but here goes ... + * + * The background color in the V library is a bit of an orphan. It is + * defined when VBindColors is called. There are parts of the V library + * that assume that v->aPixel[0] is the pixel value of the background color, + * but that is not true at this point in time if we just got through parsing + * the depth cue color. By swapping the aPixel[0] and aPixel[1] values + * (and updating the corresponding VColor entries that point to them), we + * an hack around the problem. + */ + + if (swap) { + temp = v->aPixel[0]; + v->aPixel[0] = v->aPixel[1]; + v->aPixel[1] = temp; + temp = cxt->depthCueColor->cIndex; + cxt->depthCueColor->cIndex = vc->cIndex; + vc->cIndex = temp; } return 0; *** ./V/lib/Vlib.h@@/V4.3 Tue Mar 1 13:57:03 1994 --- ./V/lib/Vlib.h Fri Mar 4 15:34:59 1994 *************** *** 31,37 **** #if !defined(__GNUC__) #include #endif - #include typedef struct _vcolor { char *color_name; /* text name */ --- 31,36 ---- *************** *** 139,144 **** --- 138,144 ---- unsigned long *pixel; /* current pixel drawing values */ unsigned long *aPixel; unsigned long bPixel[MAXCOLORS]; + XColor xdepthCueColor; XColor aColor[MAXCOLORS*MAXCOLORS]; XColor bColor[MAXCOLORS*MAXCOLORS]; Colormap cmap; *************** *** 156,168 **** int nextPixel; /* next pixel cell to allocate */ int depthCueSteps; /* 0 = no haze */ VColor *depthCueColor; /* haze color */ - XColor xdepthCueColor; /* parsed haze color */ double visibility; /* visibility (in feet) */ double *visTable; } VWorkContext; #define WCLocked 1 /* colors have been bound */ - #define WCDepthCueParsed 2 /* depth cueing color has been parsed*/ #define VSetPoint(p, xi, yi, zi) { p.x = xi; p.y = yi; p.z = zi; } #define VGetPolygonPixel(p) (p->color->xcolor.pixel) --- 156,166 ---- *************** *** 332,337 **** --- 330,336 ---- buffering */ #define VPFastAnimation 16 #define VPDepthCueing 32 /* Perform depth cueing */ + #define VPDepthCueParsed 64 /* Pixel has been assigned to dc color */ /* * VRotate options *** ./V/lib/Makefile.in@@/V4.3 Tue Mar 1 13:56:25 1994 --- ./V/lib/Makefile.in Fri Mar 4 15:34:53 1994 *************** *** 11,16 **** --- 11,17 ---- LIBOBJS = @LIBOBJS@ PROGRAMS = libV.a TOPDIR = ../.. + MAKEDEPEND = makedepend SRCS = \ VOpenVp.c \ *************** *** 120,134 **** $(AR) $@ $(OBJS) $(RANLIB) $@ - Makefile: Makefile.in config.status - $(SHELL) config.status - - config.status: configure - $(SHELL) $(srcdir)/configure --no-create - - configure: configure.in - cd $(srcdir); autoconf - clean: rm -f $(PROGRAMS) *.o core *~ --- 121,126 ---- *************** *** 145,147 **** --- 137,144 ---- rm -f TAGS install uninstall: + + depend: + $(MAKEDEPEND) $(DEFINES) @DEFS@ $(STD_INCLUDES) $(SRCS) + + # DO NOT DELETE THIS LINE -- make depend depends on it. *** ./V/Makefile.in@@/V4.3 Tue Jan 25 11:08:37 1994 --- ./V/Makefile.in Fri Mar 4 15:34:50 1994 *************** *** 6,12 **** defaulttarget: all ! all install uninstall clean mostlyclean realclean tags info dvi dist check: @for i in $(SUBDIRS) ; do \ echo Making $@ in ./$${i} ... ; \ ( cd $$i ; $(MAKE) $(MFLAGS) $@ ) ; \ --- 6,12 ---- defaulttarget: all ! all install uninstall clean mostlyclean realclean tags info dvi dist check depend: @for i in $(SUBDIRS) ; do \ echo Making $@ in ./$${i} ... ; \ ( cd $$i ; $(MAKE) $(MFLAGS) $@ ) ; \ *** ./objects/mig29.obj@@/V4.3 Mon Sep 13 14:43:58 1993 --- ./objects/mig29.obj Fri Mar 4 15:35:04 1994 *************** *** 1,236 **** ! MiG-29 ! 211 23 ! 1 7.5636 -3.46665 1.78585 ! 2 7.5636 -1.57575 1.78585 ! 3 10.9252 -1.78585 -0.6303 ! 4 10.9252 -3.3616 -0.6303 ! 5 10.9252 3.3616 -0.6303 ! 6 10.9252 1.78585 -0.6303 ! 7 7.5636 1.57575 1.78585 ! 8 7.5636 3.46665 1.78585 ! 9 -17.3332 -3.5717 0.73535 ! 10 -17.3332 -2.41615 0.73535 ! 11 -17.3332 -1.4707 -0.2101 ! 12 -17.3332 -0 -1.15555 ! 13 -17.3332 -0.10505 -2.101 ! 14 -17.3332 -3.04645 -2.3111 ! 15 -17.3332 -4.30705 -1.8909 ! 16 -17.3332 -6.0929 -1.4707 ! 17 -17.3332 -5.8828 -1.0505 ! 18 -17.3332 -5.2525 -0.8404 ! 19 -17.3332 -4.30705 -0.10505 ! 20 -17.3332 4.30705 -0.10505 ! 21 -17.3332 5.2525 -0.8404 ! 22 -17.3332 5.8828 -1.0505 ! 23 -17.3332 6.0929 -1.4707 ! 24 -17.3332 4.30705 -1.8909 ! 25 -17.3332 3.04645 -2.3111 ! 26 -17.3332 0.10505 -2.101 ! 27 -17.3332 0 -1.15555 ! 28 -17.3332 1.4707 -0.2101 ! 29 -17.3332 2.41615 0.73535 ! 30 -17.3332 3.5717 0.73535 ! 31 -5.0424 5.56765 -2.101 ! 32 -8.6141 5.8828 -3.25655 ! 33 -18.5938 7.3535 -10.7151 ! 34 -20.3797 7.29856 -9.76965 ! 35 -20.0646 7.00651 -7.7737 ! 36 -20.2747 7.0009 -7.66865 ! 37 -19.6443 6.35817 -3.25655 ! 38 -19.0141 6.28704 -2.9414 ! 39 -19.0141 5.97926 -0.73535 ! 40 -11.7656 5.68152 -0.8404 ! 41 -16.703 -0.10505 -1.6808 ! 42 -18.0686 -4.30705 -1.6808 ! 43 -19.8544 -4.93735 -1.6808 ! 44 -20.4848 -5.56765 -1.6808 ! 45 -14.1818 -5.8828 -1.6808 ! 46 4.09695 -5.77775 -1.6808 ! 47 7.5636 -5.2525 -1.6808 ! 48 19.8544 -1.57575 -1.6808 ! 49 22.1655 -1.57575 -1.6808 ! 50 25.4221 -1.36565 -1.6808 ! 51 29.8342 -0.10505 -1.6808 ! 52 -18.804 -5.35755 -1.66969 ! 53 -21.7454 -6.303 -1.55248 ! 54 -25.212 -12.2909 -0.8404 ! 55 -22.0605 -13.2363 -0.73535 ! 56 -13.2363 -5.35755 -1.6808 ! 57 -11.7656 -5.68152 -0.8404 ! 58 -19.0141 -5.97926 -0.73535 ! 59 -19.0141 -6.28704 -2.9414 ! 60 -19.6443 -6.35817 -3.25655 ! 61 -20.2747 -7.0009 -7.66865 ! 62 -20.0646 -7.00651 -7.7737 ! 63 -20.3797 -7.29856 -9.76965 ! 64 -18.5938 -7.3535 -10.7151 ! 65 -8.6141 -5.8828 -3.25655 ! 66 -5.0424 -5.56765 -2.101 ! 67 -20.9049 -2.88888 1.4707 ! 68 -16.3878 -2.87903 1.36565 ! 69 -7.66865 -2.78723 1.8909 ! 70 1.8909 -2.73367 1.99595 ! 71 4.4121 -2.72231 1.99595 ! 72 7.5636 -2.71862 1.8909 ! 73 10.9252 -2.97661 -0.8404 ! 74 7.9838 -3.00036 -0.94545 ! 75 6.5131 -3.11204 -1.99595 ! 76 0.52525 -3.14951 -2.101 ! 77 -9.2444 -3.1515 -1.6808 ! 78 -20.9049 -3.1515 -1.15555 ! 79 -20.9049 -3.04645 -0.10505 ! 80 -15.5474 -1.15555 0.0642234 ! 81 -20.9049 -1.8909 -0.10505 ! 82 -20.7999 -4.09695 -0.10505 ! 83 -17.4383 -4.4121 0 ! 84 -17.4383 4.4121 0 ! 85 -20.7999 4.09695 -0.10505 ! 86 -20.9049 1.8909 -0.10505 ! 87 -15.5474 1.15555 0.0642234 ! 88 -20.9049 3.04645 -0.10505 ! 89 -20.9049 3.1515 -1.15555 ! 90 -9.2444 3.1515 -1.6808 ! 91 0.52525 3.14951 -2.101 ! 92 6.5131 3.11204 -1.99595 ! 93 7.9838 3.00036 -0.94545 ! 94 10.9252 2.97661 -0.8404 ! 95 7.5636 2.71862 1.8909 ! 96 4.4121 2.72231 1.99595 ! 97 1.8909 2.73367 1.99595 ! 98 -7.66865 2.78723 1.8909 ! 99 -16.3878 2.87903 1.36565 ! 100 -20.9049 2.88888 1.4707 ! 101 -13.2363 5.35755 -1.6808 ! 102 -22.0605 13.2363 -0.73535 ! 103 -25.212 12.2909 -0.8404 ! 104 -21.7454 6.303 -1.55248 ! 105 -18.804 5.35755 -1.66969 ! 106 29.8342 0.10505 -1.6808 ! 107 25.4221 1.36565 -1.6808 ! 108 22.1655 1.57575 -1.6808 ! 109 19.8544 1.57575 -1.6808 ! 110 7.5636 5.2525 -1.6808 ! 111 4.09695 5.77775 -1.6808 ! 112 -14.1818 5.8828 -1.6808 ! 113 -20.4848 5.56765 -1.6808 ! 114 -19.8544 4.93735 -1.6808 ! 115 -18.0686 4.30705 -1.6808 ! 116 -16.703 0.10505 -1.6808 ! 117 29.8342 0 -1.6808 ! 118 26.6827 0 -3.04645 ! 119 23.5312 0 -3.67675 ! 120 19.3292 0 -4.30705 ! 121 16.5979 0 -5.98785 ! 122 15.1272 0 -6.19795 ! 123 12.7111 0 -5.98785 ! 124 1.4707 0 -3.7818 ! 125 -19.4343 0 -0.94545 ! 126 -18.5938 0 -0.2101 ! 127 12.501 0 -0.31515 ! 128 19.3292 0 -0.52525 ! 129 21.8504 0 -0.2101 ! 130 26.2625 0 -0.4202 ! 131 29.309 0 -0.94545 ! 132 3.1515 5.6727 -2.101 ! 133 -11.0303 5.4626 -1.99595 ! 134 -12.606 19.1191 -0.52525 ! 135 -12.1858 19.5393 -0.48421 ! 136 -9.97975 19.7494 -0.481629 ! 137 -9.6646 19.4343 -0.518073 ! 138 -7.7737 19.3292 -0.546272 ! 139 -7.7737 -19.3292 -0.546272 ! 140 -9.6646 -19.4343 -0.518073 ! 141 -9.97975 -19.7494 -0.481629 ! 142 -12.1858 -19.5393 -0.48421 ! 143 -12.606 -19.1191 -0.52525 ! 144 -11.0303 -5.4626 -1.99595 ! 145 3.1515 -5.6727 -2.101 ! 146 -9.8747 -2.5212 1.8909 ! 147 -9.8747 -3.7818 1.36565 ! 148 -9.8747 -4.09695 -0.4202 ! 149 -9.8747 -5.14745 -0.6303 ! 150 -9.8747 -5.6727 -1.15555 ! 151 -9.8747 -19.7494 -0.52525 ! 152 -9.8747 -5.98785 -2.101 ! 153 -9.8747 -3.9919 -2.7313 ! 154 -9.8747 -2.62625 -2.9414 ! 155 -9.8747 0.10505 -3.25655 ! 156 -9.8747 0 -0.10505 ! 157 -9.8747 -0.94545 -0.2101 ! 158 -9.8747 -1.6808 0.52525 ! 159 -9.8747 1.6808 0.52525 ! 160 -9.8747 0.94545 -0.2101 ! 161 -9.8747 -0 -0.10505 ! 162 -9.8747 -0.10505 -3.25655 ! 163 -9.8747 2.62625 -2.9414 ! 164 -9.8747 3.9919 -2.7313 ! 165 -9.8747 5.98785 -2.101 ! 166 -9.8747 19.7494 -0.52525 ! 167 -9.8747 5.6727 -1.15555 ! 168 -9.8747 5.14745 -0.6303 ! 169 -9.8747 4.09695 -0.4202 ! 170 -9.8747 3.7818 1.36565 ! 171 -9.8747 2.5212 1.8909 ! 172 15.5474 0 -6.19795 ! 173 15.5474 -0.94545 -5.77775 ! 174 15.5474 -1.4707 -4.8323 ! 175 15.5474 -1.57575 -3.9919 ! 176 15.5474 -1.78585 -2.101 ! 177 15.5474 -1.36565 -1.0505 ! 178 15.5474 -0.52525 -0.52525 ! 179 15.5474 0.10505 -0.31515 ! 180 15.5474 -0.10505 -0.31515 ! 181 15.5474 0.52525 -0.52525 ! 182 15.5474 1.36565 -1.0505 ! 183 15.5474 1.78585 -2.101 ! 184 15.5474 1.57575 -3.9919 ! 185 15.5474 1.4707 -4.8323 ! 186 15.5474 0.94545 -5.77775 ! 187 15.5474 0 -6.19795 ! 188 4.202 -2.62625 1.99595 ! 189 4.202 -3.7818 1.57575 ! 190 4.202 -3.9919 -0.2101 ! 191 4.202 -5.14745 -0.52525 ! 192 4.202 -5.77775 -0.94545 ! 193 4.202 -5.8828 -1.8909 ! 194 4.202 -3.7818 -2.5212 ! 195 4.202 0 -3.04645 ! 196 4.202 0 0 ! 197 4.202 -1.15555 0 ! 198 4.202 -1.8909 1.0505 ! 199 4.202 -2.20605 1.78585 ! 200 4.202 2.20605 1.78585 ! 201 4.202 1.8909 1.0505 ! 202 4.202 1.15555 0 ! 203 4.202 -0 0 ! 204 4.202 -0 -3.04645 ! 205 4.202 3.7818 -2.5212 ! 206 4.202 5.8828 -1.8909 ! 207 4.202 5.77775 -0.94545 ! 208 4.202 5.14745 -0.52525 ! 209 4.202 3.9919 -0.2101 ! 210 4.202 3.7818 1.57575 ! 211 4.202 2.62625 1.99595 ! (black gray44) 4 1 2 3 4 ! (black gray44) 4 5 6 7 8 ! gray44 11 9 10 11 12 13 14 15 16 17 18 19 ! gray44 11 20 21 22 23 24 25 26 27 28 29 30 ! gray44 10 31 32 33 34 35 36 37 38 39 40 ! gray44 11 41 42 43 44 45 46 47 48 49 50 51 ! gray44 5 52 53 54 55 56 ! gray44 10 57 58 59 60 61 62 63 64 65 66 ! gray44 13 67 68 69 70 71 72 73 74 75 76 77 78 79 ! gray44 4 80 81 82 83 ! gray44 4 84 85 86 87 ! gray44 13 88 89 90 91 92 93 94 95 96 97 98 99 100 ! gray44 5 101 102 103 104 105 ! gray44 11 106 107 108 109 110 111 112 113 114 115 116 ! gray44 15 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 ! gray44 7 132 133 134 135 136 137 138 ! gray44 7 139 140 141 142 143 144 145 ! gray44 13 146 147 148 149 150 151 152 153 154 155 156 157 158 ! gray44 13 159 160 161 162 163 164 165 166 167 168 169 170 171 ! gray44 8 172 173 174 175 176 177 178 179 ! gray44 8 180 181 182 183 184 185 186 187 ! gray44 12 188 189 190 191 192 193 194 195 196 197 198 199 ! gray44 12 200 201 202 203 204 205 206 207 208 209 210 211 --- 1,262 ---- ! object ! 235 25 ! 1 -20.7292 -3.91308 -0.575279 ! 2 -20.7292 -3.49195 -0.996413 ! 3 -20.7292 -2.91667 -1.15056 ! 4 -20.7292 -2.34139 -0.996413 ! 5 -20.7292 -1.92025 -0.575279 ! 6 -20.7292 -1.76611 6.51849e-16 ! 7 -20.7292 -1.92025 0.575279 ! 8 -20.7292 -2.34139 0.996413 ! 9 -20.7292 -2.91667 1.15056 ! 10 -20.7292 -3.49195 0.996413 ! 11 -20.7292 -3.91308 0.575279 ! 12 -20.7292 -4.06723 0 ! 13 -20.7292 4.06723 0 ! 14 -20.7292 3.91308 0.575279 ! 15 -20.7292 3.49195 0.996413 ! 16 -20.7292 2.91667 1.15056 ! 17 -20.7292 2.34139 0.996413 ! 18 -20.7292 1.92025 0.575279 ! 19 -20.7292 1.76611 6.51849e-16 ! 20 -20.7292 1.92025 -0.575279 ! 21 -20.7292 2.34139 -0.996413 ! 22 -20.7292 2.91667 -1.15056 ! 23 -20.7292 3.49195 -0.996413 ! 24 -20.7292 3.91308 -0.575279 ! 25 7.5636 -3.46665 1.78585 ! 26 7.5636 -1.57575 1.78585 ! 27 10.9252 -1.78585 -0.6303 ! 28 10.9252 -3.3616 -0.6303 ! 29 10.9252 3.3616 -0.6303 ! 30 10.9252 1.78585 -0.6303 ! 31 7.5636 1.57575 1.78585 ! 32 7.5636 3.46665 1.78585 ! 33 -17.3332 -3.5717 0.73535 ! 34 -17.3332 -2.41615 0.73535 ! 35 -17.3332 -1.4707 -0.2101 ! 36 -17.3332 -0 -1.15555 ! 37 -17.3332 -0.10505 -2.101 ! 38 -17.3332 -3.04645 -2.3111 ! 39 -17.3332 -4.30705 -1.8909 ! 40 -17.3332 -6.0929 -1.4707 ! 41 -17.3332 -5.8828 -1.0505 ! 42 -17.3332 -5.2525 -0.8404 ! 43 -17.3332 -4.30705 -0.10505 ! 44 -17.3332 4.30705 -0.10505 ! 45 -17.3332 5.2525 -0.8404 ! 46 -17.3332 5.8828 -1.0505 ! 47 -17.3332 6.0929 -1.4707 ! 48 -17.3332 4.30705 -1.8909 ! 49 -17.3332 3.04645 -2.3111 ! 50 -17.3332 0.10505 -2.101 ! 51 -17.3332 0 -1.15555 ! 52 -17.3332 1.4707 -0.2101 ! 53 -17.3332 2.41615 0.73535 ! 54 -17.3332 3.5717 0.73535 ! 55 -5.0424 5.56765 -2.101 ! 56 -8.6141 5.8828 -3.25655 ! 57 -18.5938 7.3535 -10.7151 ! 58 -20.3797 7.29856 -9.76965 ! 59 -20.0646 7.00651 -7.7737 ! 60 -20.2747 7.0009 -7.66865 ! 61 -19.6443 6.35817 -3.25655 ! 62 -19.0141 6.28704 -2.9414 ! 63 -19.0141 5.97926 -0.73535 ! 64 -11.7656 5.68152 -0.8404 ! 65 -16.703 -0.10505 -1.6808 ! 66 -18.0686 -4.30705 -1.6808 ! 67 -19.8544 -4.93735 -1.6808 ! 68 -20.4848 -5.56765 -1.6808 ! 69 -14.1818 -5.8828 -1.6808 ! 70 4.09695 -5.77775 -1.6808 ! 71 7.5636 -5.2525 -1.6808 ! 72 19.8544 -1.57575 -1.6808 ! 73 22.1655 -1.57575 -1.6808 ! 74 25.4221 -1.36565 -1.6808 ! 75 29.8342 -0.10505 -1.6808 ! 76 -18.804 -5.35755 -1.66969 ! 77 -21.7454 -6.303 -1.55248 ! 78 -25.212 -12.2909 -0.8404 ! 79 -22.0605 -13.2363 -0.73535 ! 80 -13.2363 -5.35755 -1.6808 ! 81 -11.7656 -5.68152 -0.8404 ! 82 -19.0141 -5.97926 -0.73535 ! 83 -19.0141 -6.28704 -2.9414 ! 84 -19.6443 -6.35817 -3.25655 ! 85 -20.2747 -7.0009 -7.66865 ! 86 -20.0646 -7.00651 -7.7737 ! 87 -20.3797 -7.29856 -9.76965 ! 88 -18.5938 -7.3535 -10.7151 ! 89 -8.6141 -5.8828 -3.25655 ! 90 -5.0424 -5.56765 -2.101 ! 91 -20.9049 -2.88888 1.4707 ! 92 -16.3878 -2.87903 1.36565 ! 93 -7.66865 -2.78723 1.8909 ! 94 1.8909 -2.73367 1.99595 ! 95 4.4121 -2.72231 1.99595 ! 96 7.5636 -2.71862 1.8909 ! 97 10.9252 -2.97661 -0.8404 ! 98 7.9838 -3.00036 -0.94545 ! 99 6.5131 -3.11204 -1.99595 ! 100 0.52525 -3.14951 -2.101 ! 101 -9.2444 -3.1515 -1.6808 ! 102 -20.9049 -3.1515 -1.15555 ! 103 -20.9049 -3.04645 -0.10505 ! 104 -15.5474 -1.15555 0.0642234 ! 105 -20.9049 -1.8909 -0.10505 ! 106 -20.7999 -4.09695 -0.10505 ! 107 -17.4383 -4.4121 0 ! 108 -17.4383 4.4121 0 ! 109 -20.7999 4.09695 -0.10505 ! 110 -20.9049 1.8909 -0.10505 ! 111 -15.5474 1.15555 0.0642234 ! 112 -20.9049 3.04645 -0.10505 ! 113 -20.9049 3.1515 -1.15555 ! 114 -9.2444 3.1515 -1.6808 ! 115 0.52525 3.14951 -2.101 ! 116 6.5131 3.11204 -1.99595 ! 117 7.9838 3.00036 -0.94545 ! 118 10.9252 2.97661 -0.8404 ! 119 7.5636 2.71862 1.8909 ! 120 4.4121 2.72231 1.99595 ! 121 1.8909 2.73367 1.99595 ! 122 -7.66865 2.78723 1.8909 ! 123 -16.3878 2.87903 1.36565 ! 124 -20.9049 2.88888 1.4707 ! 125 -13.2363 5.35755 -1.6808 ! 126 -22.0605 13.2363 -0.73535 ! 127 -25.212 12.2909 -0.8404 ! 128 -21.7454 6.303 -1.55248 ! 129 -18.804 5.35755 -1.66969 ! 130 29.8342 0.10505 -1.6808 ! 131 25.4221 1.36565 -1.6808 ! 132 22.1655 1.57575 -1.6808 ! 133 19.8544 1.57575 -1.6808 ! 134 7.5636 5.2525 -1.6808 ! 135 4.09695 5.77775 -1.6808 ! 136 -14.1818 5.8828 -1.6808 ! 137 -20.4848 5.56765 -1.6808 ! 138 -19.8544 4.93735 -1.6808 ! 139 -18.0686 4.30705 -1.6808 ! 140 -16.703 0.10505 -1.6808 ! 141 29.8342 0 -1.6808 ! 142 26.6827 0 -3.04645 ! 143 23.5312 0 -3.67675 ! 144 19.3292 0 -4.30705 ! 145 16.5979 0 -5.98785 ! 146 15.1272 0 -6.19795 ! 147 12.7111 0 -5.98785 ! 148 1.4707 0 -3.7818 ! 149 -19.4343 0 -0.94545 ! 150 -18.5938 0 -0.2101 ! 151 12.501 0 -0.31515 ! 152 19.3292 0 -0.52525 ! 153 21.8504 0 -0.2101 ! 154 26.2625 0 -0.4202 ! 155 29.309 0 -0.94545 ! 156 3.1515 5.6727 -2.101 ! 157 -11.0303 5.4626 -1.99595 ! 158 -12.606 19.1191 -0.52525 ! 159 -12.1858 19.5393 -0.48421 ! 160 -9.97975 19.7494 -0.481629 ! 161 -9.6646 19.4343 -0.518073 ! 162 -7.7737 19.3292 -0.546272 ! 163 -7.7737 -19.3292 -0.546272 ! 164 -9.6646 -19.4343 -0.518073 ! 165 -9.97975 -19.7494 -0.481629 ! 166 -12.1858 -19.5393 -0.48421 ! 167 -12.606 -19.1191 -0.52525 ! 168 -11.0303 -5.4626 -1.99595 ! 169 3.1515 -5.6727 -2.101 ! 170 -9.8747 -2.5212 1.8909 ! 171 -9.8747 -3.7818 1.36565 ! 172 -9.8747 -4.09695 -0.4202 ! 173 -9.8747 -5.14745 -0.6303 ! 174 -9.8747 -5.6727 -1.15555 ! 175 -9.8747 -19.7494 -0.52525 ! 176 -9.8747 -5.98785 -2.101 ! 177 -9.8747 -3.9919 -2.7313 ! 178 -9.8747 -2.62625 -2.9414 ! 179 -9.8747 0.10505 -3.25655 ! 180 -9.8747 0 -0.10505 ! 181 -9.8747 -0.94545 -0.2101 ! 182 -9.8747 -1.6808 0.52525 ! 183 -9.8747 1.6808 0.52525 ! 184 -9.8747 0.94545 -0.2101 ! 185 -9.8747 -0 -0.10505 ! 186 -9.8747 -0.10505 -3.25655 ! 187 -9.8747 2.62625 -2.9414 ! 188 -9.8747 3.9919 -2.7313 ! 189 -9.8747 5.98785 -2.101 ! 190 -9.8747 19.7494 -0.52525 ! 191 -9.8747 5.6727 -1.15555 ! 192 -9.8747 5.14745 -0.6303 ! 193 -9.8747 4.09695 -0.4202 ! 194 -9.8747 3.7818 1.36565 ! 195 -9.8747 2.5212 1.8909 ! 196 15.5474 0 -6.19795 ! 197 15.5474 -0.94545 -5.77775 ! 198 15.5474 -1.4707 -4.8323 ! 199 15.5474 -1.57575 -3.9919 ! 200 15.5474 -1.78585 -2.101 ! 201 15.5474 -1.36565 -1.0505 ! 202 15.5474 -0.52525 -0.52525 ! 203 15.5474 0.10505 -0.31515 ! 204 15.5474 -0.10505 -0.31515 ! 205 15.5474 0.52525 -0.52525 ! 206 15.5474 1.36565 -1.0505 ! 207 15.5474 1.78585 -2.101 ! 208 15.5474 1.57575 -3.9919 ! 209 15.5474 1.4707 -4.8323 ! 210 15.5474 0.94545 -5.77775 ! 211 15.5474 0 -6.19795 ! 212 4.202 -2.62625 1.99595 ! 213 4.202 -3.7818 1.57575 ! 214 4.202 -3.9919 -0.2101 ! 215 4.202 -5.14745 -0.52525 ! 216 4.202 -5.77775 -0.94545 ! 217 4.202 -5.8828 -1.8909 ! 218 4.202 -3.7818 -2.5212 ! 219 4.202 0 -3.04645 ! 220 4.202 0 0 ! 221 4.202 -1.15555 0 ! 222 4.202 -1.8909 1.0505 ! 223 4.202 -2.20605 1.78585 ! 224 4.202 2.20605 1.78585 ! 225 4.202 1.8909 1.0505 ! 226 4.202 1.15555 0 ! 227 4.202 -0 0 ! 228 4.202 -0 -3.04645 ! 229 4.202 3.7818 -2.5212 ! 230 4.202 5.8828 -1.8909 ! 231 4.202 5.77775 -0.94545 ! 232 4.202 5.14745 -0.52525 ! 233 4.202 3.9919 -0.2101 ! 234 4.202 3.7818 1.57575 ! 235 4.202 2.62625 1.99595 ! (black gray44) 12 1 2 3 4 5 6 7 8 9 10 11 12 ! (black gray44) 12 13 14 15 16 17 18 19 20 21 22 23 24 ! (black gray44) 4 25 26 27 28 ! (black gray44) 4 29 30 31 32 ! gray44 11 33 34 35 36 37 38 39 40 41 42 43 ! gray44 11 44 45 46 47 48 49 50 51 52 53 54 ! gray44 10 55 56 57 58 59 60 61 62 63 64 ! gray44 11 65 66 67 68 69 70 71 72 73 74 75 ! gray44 5 76 77 78 79 80 ! gray44 10 81 82 83 84 85 86 87 88 89 90 ! gray44 13 91 92 93 94 95 96 97 98 99 100 101 102 103 ! gray44 4 104 105 106 107 ! gray44 4 108 109 110 111 ! gray44 13 112 113 114 115 116 117 118 119 120 121 122 123 124 ! gray44 5 125 126 127 128 129 ! gray44 11 130 131 132 133 134 135 136 137 138 139 140 ! gray44 15 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 ! gray44 7 156 157 158 159 160 161 162 ! gray44 7 163 164 165 166 167 168 169 ! gray44 13 170 171 172 173 174 175 176 177 178 179 180 181 182 ! gray44 13 183 184 185 186 187 188 189 190 191 192 193 194 195 ! gray44 8 196 197 198 199 200 201 202 203 ! gray44 8 204 205 206 207 208 209 210 211 ! gray44 12 212 213 214 215 216 217 218 219 220 221 222 223 ! gray44 12 224 225 226 227 228 229 230 231 232 233 234 235 *** ./objects/Makefile.in@@/V4.3 Fri Feb 4 13:34:55 1994 --- ./objects/Makefile.in Fri Mar 4 15:35:02 1994 *************** *** 25,31 **** mmarker.au omarker.au \ rwr.au screetch.au stall.au ! all clean mostlyclean realclean tags info dvi dist check: install: $(SCENES) $(OBJECTS) $(SOUNDS) -mkdir -p $(ACM_OBJECT_LIBRARY) --- 25,31 ---- mmarker.au omarker.au \ rwr.au screetch.au stall.au ! all clean mostlyclean realclean tags info dvi dist check depend: install: $(SCENES) $(OBJECTS) $(SOUNDS) -mkdir -p $(ACM_OBJECT_LIBRARY) *** ./Makefile.in@@/V4.3 Tue Jan 25 11:10:13 1994 --- ./Makefile.in Fri Mar 4 15:34:43 1994 *************** *** 7,13 **** # by default -- they get confused by the following target. defaulttarget: all ! all install uninstall clean mostlyclean realclean tags info dvi dist check: @for i in $(SUBDIRS) ; do \ echo Making $@ in ./$${i} ... ; \ ( cd $$i ; $(MAKE) $(MFLAGS) $@ ) ; \ --- 7,13 ---- # by default -- they get confused by the following target. defaulttarget: all ! all install uninstall clean mostlyclean realclean tags info dvi dist check depend: @for i in $(SUBDIRS) ; do \ echo Making $@ in ./$${i} ... ; \ ( cd $$i ; $(MAKE) $(MFLAGS) $@ ) ; \ *** ./src/doViews.c@@/V4.3 Tue Mar 1 13:57:14 1994 --- ./src/doViews.c Fri Mar 4 15:35:11 1994 *************** *** 316,322 **** * If plane has died, then kill the chaser */ ! if (cp->type != CT_PLANE) { killChaser ( c ); continue; } --- 316,322 ---- * If plane has died, then kill the chaser */ ! if (cp->type != CT_PLANE && cp->type != CT_DRONE) { killChaser ( c ); continue; } *** ./src/init.c@@/V4.3 Tue Mar 1 13:57:18 1994 --- ./src/init.c Fri Mar 4 15:35:14 1994 *************** *** 122,128 **** */ VSetDepthCue (VAllocColor("#749395"), 8); ! VSetVisibility (15.0 * NM); name = (sceneFile) ? sceneFile : "default-scene"; --- 122,128 ---- */ VSetDepthCue (VAllocColor("#749395"), 8); ! VSetVisibility (visibility); name = (sceneFile) ? sceneFile : "default-scene"; *** ./src/patchlevel.h@@/V4.3 Thu Jan 20 14:37:49 1994 --- ./src/patchlevel.h Fri Mar 4 15:35:17 1994 *************** *** 1,4 **** #define REVISION 4 ! #define PATCHLEVEL 3 ! #define REVISION_STRING "4.3" --- 1,4 ---- #define REVISION 4 ! #define PATCHLEVEL 4 ! #define REVISION_STRING "4.4" *** ./src/pm.h@@/V4.3 Fri Jan 28 10:52:25 1994 --- ./src/pm.h Fri Mar 4 15:35:19 1994 *************** *** 390,395 **** --- 390,396 ---- _var_type int arcadeMode; /* set by -a switch */ _var_type int chaseOthers; /* can one chase other's planes ? */ _var_type double droneAggressiveness; /* how hard drones maneuver */ + _var_type double visibility; /* visibility (feet) */ #undef _var_type *** ./src/server.c@@/V4.3 Fri Jan 28 10:50:53 1994 --- ./src/server.c Fri Mar 4 15:35:22 1994 *************** *** 29,34 **** --- 29,36 ---- #include #include #include + #include "pm.h" + #undef a #ifdef SVR4 /* *************** *** 51,59 **** static sigset_t sigset_mask, sigset_omask; #endif /* SVR4 */ - extern int arcadeMode, ptblCount, ctblCount; - extern int chaseOthers; - #if !defined(lint) && !defined(SABER) static char sccsid[] = "@(#) acm by Riley Rainey; Revision 3.0"; #endif --- 53,58 ---- *************** *** 62,68 **** int sdebug = 1; int listen_socket; char *sceneFile = (char *) NULL; ! extern double droneAggressiveness; void parseinfo (s, a, b, c) char *s, *a, *b, *c; { --- 61,67 ---- int sdebug = 1; int listen_socket; char *sceneFile = (char *) NULL; ! extern double atof(); void parseinfo (s, a, b, c) char *s, *a, *b, *c; { *************** *** 105,110 **** --- 104,111 ---- ptblCount = ctblCount = 0; chaseOthers = 0; + visibility = 50.0 * NM; + /* * parse arguments */ *************** *** 133,139 **** case 'd': if (strcmp (argv[i], "-da") == 0 && argv[++i]) { ! droneAggressiveness = atof(argv[i]); if (droneAggressiveness <= MIN_DRONE_FACTOR) { droneAggressiveness = MIN_DRONE_FACTOR; } --- 134,140 ---- case 'd': if (strcmp (argv[i], "-da") == 0 && argv[++i]) { ! droneAggressiveness = atof(argv[i]) * NM; if (droneAggressiveness <= MIN_DRONE_FACTOR) { droneAggressiveness = MIN_DRONE_FACTOR; } *************** *** 142,147 **** --- 143,162 ---- } break; } + + case 'v': + if (strcmp (argv[i], "-visibility") == 0 && + argv[++i]) { + visibility = atof(argv[i]); + if (visibility < 1.0) { + visibility = 1.0; + } + else if (visibility > 500.0) { + visibility = 500.0; + } + visibility *= NM; + } + break; default: fprintf (stderr, "Invalid switch \"%s\"\n", argv[i]); *** ./src/Makefile.in@@/V4.3 Thu Jan 27 16:17:37 1994 --- ./src/Makefile.in Fri Mar 4 15:35:07 1994 *************** *** 16,21 **** --- 16,22 ---- TOPDIR = .. CLEAN_THESE = flight-state black_box_input black_box_output bitmap.h manext = 1 + MAKEDEPEND = makedepend ACM_OBJECT_LIBRARY = $(prefix)/games/acm/ *************** *** 49,54 **** --- 50,56 ---- $(srcdir)/flaps3.xbm $(srcdir)/gearDown.xbm \ $(srcdir)/gearTran.xbm $(srcdir)/gearUp.xbm \ $(srcdir)/handleDn.xbm $(srcdir)/handleUp.xbm + SRCS = $(SRCS1) $(SRCS2) all: $(PROGRAMS) *************** *** 61,75 **** ../V/lib/libV.a: cd ../V/lib; $(MAKE) -e - Makefile: Makefile.in $(TOPDIR)/config.status - cd $(TOPDIR); $(SHELL) config.status - - config.status: $(TOPDIR)/configure - cd $(TOPDIR); $(SHELL) $(srcdir)/configure --no-create - - configure: $(TOPDIR)/configure.in - cd $(TOPDIR); cd $(srcdir); autoconf - mostlyclean clean: rm -f $(PROGRAMS) *.o core *~ --- 63,68 ---- *************** *** 98,100 **** --- 91,98 ---- bitmap.h: $(BITMAP_FILES) grep '^#define' $(BITMAP_FILES) | sed -e 's/^.*://g' > $@ + + depend: bitmap.h + $(MAKEDEPEND) $(DEFINES) @DEFS@ $(STD_INCLUDES) $(SRCS) + + # DO NOT DELETE THIS LINE -- make depend depends on it. *** ./src/chaser.c@@/V4.3 Thu Jan 20 14:37:10 1994 --- ./src/chaser.c Fri Mar 4 15:35:09 1994 *************** *** 37,44 **** register craft *c; int i; ! if (ptbl[who].type == CT_PLANE ) { ! if (!chaseOthers && strcmp(ptbl[who].name, me)) return NC_CANNOT_CHASE; for ( i=0; i