Yadex game definition files
diff -U4 -r -N yadex-1.7.0/docsrc/preview.html yadex-1.7.0-aja/docsrc/preview.html
--- yadex-1.7.0/docsrc/preview.html 1970-01-01 10:00:00.000000000 +1000
+++ yadex-1.7.0-aja/docsrc/preview.html 2004-01-04 14:09:55.000000000 +1100
@@ -0,0 +1,108 @@
+
+
+Yadex 3D level preview
+
+
+
+
+
+
Yadex $VERSION ($SOURCE_DATE)
+
3D Level Preview
+
+
+
+
+ What's it for
+
+The 3D level preview function lets you get a rough idea of what
+your level looks like, quickly, without all the hassle of saving,
+building nodes and starting DOOM. It is activated by pressing the
+`R' key while editing a level, and draws the player's view that
+you would see within DOOM (with some limitations). While the
+rendering window is up, you can move around the level using the
+cursor keys and toggle things like texturing and sprites on/off.
+
+
Key bindings
+
+
+- [Left]
+
[Right]
+ - Turn the view left or right. Use the SHIFT key to
+turn a greater amount.
+
+
- [Up]
+
[Down]
+ - Move the view forward or back. Use the SHIFT key to
+move a greater distance.
+
+
- [n]
+
[m]
+ - Move the view sideways left or right (strafing). Uppercase `N'
+and `M' (i.e. with the SHIFT key) will move a greater distance.
+
+
- [c]
+
[d]
+ - Move the view upwards or downwards (flying). Uppercase `C' and
+`D' (i.e. with the SHIFT key) will move a greater distance. Note
+that you cannot move up or down when "walking" mode is enabled.
+
+
- [t]
+
- Toggle texture mapping. When disabled (the default), all walls,
+ceilings and floors are drawn with solid (somewhat random) colours.
+
+
- [s]
+
- Toggle sprites.
+
+
- [w]
+
- Toggle walking mode. When enabled, the view height is always
+above the current floor. For example, if you move forward over a
+cliff, the view will drop down. When disabled (the default), you can
+fly about the level at any height.
+
+
- [Esc]
+
[q]
+ - Exit the 3D level preview. The current viewing state (position,
+direction, etc) are remembered, and will be used next time the 3D
+preview is activated (unless the player object has been moved, or a
+different level was loaded).
+
+
+
+ Features
+
+
+- No BSP (nodes) required !
+
- Textures and flats are drawn exactly like DOOM, including X/Y
+offsets and upper/lower unpegging flags.
+
- Sky is handled just like in DOOM (but drawn in solid blue).
+
+
+ Limitations
+
+
+- No lighting, the level appears full-bright all the time.
+
- No mid-masked textures (rails, gratings) are drawn.
+
- Thing sprites (especially monsters) are always drawn facing
+you, even when their direction is away from you.
+
- Sprite positioning may be inaccurate, because their X and
+Y offsets are not honoured.
+
- Things that are supposed to hang from the ceiling
+(hanging body parts, chandeliers, etc) will appear on the floor.
+
- There are some glitches in the current renderer, which look like
+"slimetrails" (vertical lines).
+
+
+ Caveats
+
+One last thing. The 3D preview function can use a huge amount of
+memory when texturing and sprites are both enabled (and a large amount
+even when texturing and sprites are both disabled). If your computer
+has a very low amount of memory (e.g. less than 16 MB), then Yadex may
+crash with an out of memory error. I think you are unlikely to hit
+this problem, but if in doubt, save your work first.
+
+
+
AJA $SELF_DATE
+
+
diff -U4 -r -N yadex-1.7.0/GNUmakefile yadex-1.7.0-aja/GNUmakefile
--- yadex-1.7.0/GNUmakefile 2004-01-04 13:56:31.000000000 +1100
+++ yadex-1.7.0-aja/GNUmakefile 2004-01-04 14:12:38.000000000 +1100
@@ -159,8 +159,9 @@
s_misc s_prop s_slice s_split \
s_swapf s_vertices sanity scrnshot \
selbox selectn selpath selrect \
serialnum spritdir sticker swapmem \
+ r_render r_images \
t_centre t_flags t_prop t_spin \
textures things trace v_centre \
v_merge v_polyg vectext verbmsg \
version wadfile wadlist wadnamec \
@@ -237,8 +237,9 @@
docsrc/keeping_up.html \
docsrc/legal.html \
docsrc/packagers_guide.html \
docsrc/palette.html \
+ docsrc/preview.html \
docsrc/reporting.html \
docsrc/tips.html \
docsrc/trivia.html \
docsrc/trouble.html \
diff -U4 -r -N yadex-1.7.0/src/editloop.cc yadex-1.7.0-aja/src/editloop.cc
--- yadex-1.7.0/src/editloop.cc 2003-07-05 21:12:32.000000000 +1000
+++ yadex-1.7.0-aja/src/editloop.cc 2004-01-03 23:51:21.000000000 +1100
@@ -69,8 +69,9 @@
#include "x_centre.h"
#include "x_exchng.h"
#include "x_hover.h"
#include "xref.h"
+#include "r_render.h"
#ifdef Y_X11
#include
#endif
@@ -2206,8 +2207,15 @@
{
DumpSelection (e.Selected);
}
+ // [R] Render 3D view (AJA)
+ else if (is.key == 'R')
+ {
+ Render3D ();
+ RedrawMap = 1;
+ }
+
// [@] Show font (not documented)
else if (is.key == '@')
{
show_font ();
diff -U4 -r -N yadex-1.7.0/src/gcolour1.cc yadex-1.7.0-aja/src/gcolour1.cc
--- yadex-1.7.0/src/gcolour1.cc 2003-03-28 23:37:32.000000000 +1100
+++ yadex-1.7.0-aja/src/gcolour1.cc 2004-01-03 23:51:21.000000000 +1100
@@ -126,8 +126,23 @@
}
}
verbmsg ("colours: colour %d remapped to %d (delta %d)\n",
IMG_TRANSP, colour0, smallest_delta);
+
+ rgb_c med_blue (0, 0, 128);
+ sky_colour = 0;
+ smallest_delta = INT_MAX;
+
+ for (size_t n = 0; n < DOOM_COLOURS; n++)
+ {
+ int delta = med_blue - rgb_values[n];
+ if (delta < smallest_delta)
+ {
+ sky_colour = n;
+ smallest_delta = delta;
+ }
+ }
+ verbmsg ("Sky Colour remapped to %d (delta %d)\n", sky_colour, smallest_delta);
}
#endif
FreeFarMemory (dpal);
diff -U4 -r -N yadex-1.7.0/src/gcolour2.cc yadex-1.7.0-aja/src/gcolour2.cc
--- yadex-1.7.0/src/gcolour2.cc 2003-03-28 23:37:32.000000000 +1100
+++ yadex-1.7.0-aja/src/gcolour2.cc 2004-01-03 23:51:21.000000000 +1100
@@ -34,5 +34,6 @@
pcolour_t *game_colour = 0; // Pixel values for the DOOM_COLOURS game clrs.
int colour0; // Game colour to which g. colour 0 is remapped
+int sky_colour; // Game colour for a medium sky blue
diff -U4 -r -N yadex-1.7.0/src/gcolour2.h yadex-1.7.0-aja/src/gcolour2.h
--- yadex-1.7.0/src/gcolour2.h 2000-08-11 07:18:16.000000000 +1000
+++ yadex-1.7.0-aja/src/gcolour2.h 2004-01-03 23:51:21.000000000 +1100
@@ -9,5 +9,6 @@
extern pcolour_t *game_colour; // Pixel values for the DOOM_COLOURS game clrs.
extern int colour0; // Game colour to which g. colour 0 is remapped
+extern int sky_colour; // Game colour for a medium blue sky
diff -U4 -r -N yadex-1.7.0/src/r_images.cc yadex-1.7.0-aja/src/r_images.cc
--- yadex-1.7.0/src/r_images.cc 1970-01-01 10:00:00.000000000 +1000
+++ yadex-1.7.0-aja/src/r_images.cc 2004-01-04 00:41:35.000000000 +1100
@@ -0,0 +1,400 @@
+/*
+ * r_images.cc
+ * AJA 2002-04-23 (based on textures.cc and flats.cc)
+ */
+
+
+/*
+This file is part of Yadex.
+
+Yadex incorporates code from DEU 5.21 that was put in the public domain in
+1994 by Raphaël Quinet and Brendon Wyber.
+
+The rest of Yadex is Copyright © 1997-2000 André Majorel.
+
+This program is free software; you can redistribute it and/or modify it under
+the terms of the GNU General Public License as published by the Free Software
+Foundation; either version 2 of the License, or (at your option) any later
+version.
+
+This program is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+
+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.
+*/
+
+
+#include "yadex.h"
+#ifdef Y_X11
+#include
+#endif
+#include "dialog.h"
+#include "game.h" /* yg_picture_format */
+#include "gfx.h"
+#include "levels.h"
+#include "lists.h"
+#include "patchdir.h"
+#include "pic2img.h"
+#include "sticker.h"
+#include "flats.h"
+#include "textures.h"
+#include "wadfile.h"
+#include "wads.h"
+#include "wadres.h"
+#include "wstructs.h"
+
+#include "r_images.h"
+
+
+/*
+ * flat_list_entry_match
+ * Function used by bsearch() to locate a particular
+ * flat in the FTexture.
+ */
+static int flat_list_entry_match (const void *key, const void *flat_list_entry)
+{
+return y_strnicmp ((const char *) key,
+ ((const flat_list_entry_t *) flat_list_entry)->name,
+ WAD_FLAT_NAME);
+}
+
+
+/*
+ * load a flat into a new image. NULL if not found.
+ */
+
+Img * Flat2Img (const wad_flat_name_t& fname)
+{
+char name[WAD_FLAT_NAME + 1];
+strncpy (name, fname, WAD_FLAT_NAME);
+name[WAD_FLAT_NAME] = 0;
+
+flat_list_entry_t *flat = (flat_list_entry_t *)
+ bsearch (name, flat_list, NumFTexture, sizeof *flat_list,
+ flat_list_entry_match);
+
+if (! flat) // Not found in list
+ return 0;
+
+int width = DOOM_FLAT_WIDTH; // Big deal !
+int height = DOOM_FLAT_HEIGHT;
+
+const Wad_file *wadfile = flat->wadfile;
+wadfile->seek (flat->offset);
+
+Img *img = new Img (width, height, false);
+
+wadfile->read_bytes (img->wbuf (), (long) width * height);
+
+return img;
+}
+
+
+/*
+ * load a wall texture ("TEXTURE1" or "TEXTURE2" object) into an image.
+ * Returns NULL if not found or error.
+ */
+
+Img * Tex2Img (const wad_tex_name_t& texname)
+{
+MDirPtr dir = 0; /* main directory pointer to the TEXTURE* entries */
+i32 *offsets; /* array of offsets to texture names */
+int n; /* general counter */
+i16 width, height; /* size of the texture */
+i16 npatches; /* number of wall patches used to build this texture */
+i32 numtex; /* number of texture names in TEXTURE* list */
+i32 texofs; /* offset in the wad file to the texture data */
+char tname[WAD_TEX_NAME + 1]; /* texture name */
+char picname[WAD_PIC_NAME + 1]; /* wall patch name */
+bool have_dummy_bytes;
+int header_size;
+int item_size;
+
+char name[WAD_TEX_NAME + 1];
+strncpy (name, texname, WAD_TEX_NAME);
+name[WAD_TEX_NAME] = 0;
+
+// Iwad-dependant details
+if (yg_texture_format == YGTF_NAMELESS)
+ {
+ have_dummy_bytes = true;
+ header_size = 14;
+ item_size = 10;
+ }
+else if (yg_texture_format == YGTF_NORMAL)
+ {
+ have_dummy_bytes = true;
+ header_size = 14;
+ item_size = 10;
+ }
+else if (yg_texture_format == YGTF_STRIFE11)
+ {
+ have_dummy_bytes = false;
+ header_size = 10;
+ item_size = 6;
+ }
+else
+ {
+ nf_bug ("Bad texture format %d.", (int) yg_texture_format);
+ return 0;
+ }
+
+/* offset for texture we want. */
+texofs = 0;
+// Doom alpha 0.4 : "TEXTURES", no names
+if (yg_texture_lumps == YGTL_TEXTURES && yg_texture_format == YGTF_NAMELESS)
+ {
+ dir = FindMasterDir (MasterDir, "TEXTURES");
+ if (dir != NULL)
+ {
+ dir->wadfile->seek (dir->dir.start);
+ dir->wadfile->read_i32 (&numtex);
+ if (WAD_TEX_NAME < 7) nf_bug ("WAD_TEX_NAME too small"); // Sanity
+ if (! y_strnicmp (name, "TEX", 3)
+ && isdigit (name[3])
+ && isdigit (name[4])
+ && isdigit (name[5])
+ && isdigit (name[6])
+ && name[7] == '\0')
+ {
+ long num;
+ if (sscanf (name + 3, "%4ld", &num) == 1
+ && num >= 0 && num < numtex)
+ {
+ dir->wadfile->seek (dir->dir.start + 4 + 4 * num);
+ dir->wadfile->read_i32 (&texofs);
+ texofs += dir->dir.start;
+ }
+ }
+ }
+ }
+// Doom alpha 0.5 : only "TEXTURES"
+else if (yg_texture_lumps == YGTL_TEXTURES
+ && (yg_texture_format == YGTF_NORMAL || yg_texture_format == YGTF_STRIFE11))
+ {
+ // Is it in TEXTURES ?
+ dir = FindMasterDir (MasterDir, "TEXTURES");
+ if (dir != NULL) // (Theoretically, it should always exist)
+ {
+ dir->wadfile->seek (dir->dir.start);
+ dir->wadfile->read_i32 (&numtex);
+ /* read in the offsets for texture1 names and info. */
+ offsets = (i32 *) GetMemory ((long) numtex * 4);
+ dir->wadfile->read_i32 (offsets, numtex);
+ for (n = 0; n < numtex && !texofs; n++)
+ {
+ dir->wadfile->seek (dir->dir.start + offsets[n]);
+ dir->wadfile->read_bytes (&tname, WAD_TEX_NAME);
+ if (!y_strnicmp (tname, name, WAD_TEX_NAME))
+ texofs = dir->dir.start + offsets[n];
+ }
+ FreeMemory (offsets);
+ }
+ }
+// Other iwads : "TEXTURE1" and "TEXTURE2"
+else if (yg_texture_lumps == YGTL_NORMAL
+ && (yg_texture_format == YGTF_NORMAL || yg_texture_format == YGTF_STRIFE11))
+ {
+ // Is it in TEXTURE1 ?
+ dir = FindMasterDir (MasterDir, "TEXTURE1");
+ if (dir != NULL) // (Theoretically, it should always exist)
+ {
+ dir->wadfile->seek (dir->dir.start);
+ dir->wadfile->read_i32 (&numtex);
+ /* read in the offsets for texture1 names and info. */
+ offsets = (i32 *) GetMemory ((long) numtex * 4);
+ dir->wadfile->read_i32 (offsets, numtex);
+ for (n = 0; n < numtex && !texofs; n++)
+ {
+ dir->wadfile->seek (dir->dir.start + offsets[n]);
+ dir->wadfile->read_bytes (&tname, WAD_TEX_NAME);
+ if (!y_strnicmp (tname, name, WAD_TEX_NAME))
+ texofs = dir->dir.start + offsets[n];
+ }
+ FreeMemory (offsets);
+ }
+ // Well, then is it in TEXTURE2 ?
+ if (texofs == 0)
+ {
+ dir = FindMasterDir (MasterDir, "TEXTURE2");
+ if (dir != NULL) // Doom II has no TEXTURE2
+ {
+ dir->wadfile->seek (dir->dir.start);
+ dir->wadfile->read_i32 (&numtex);
+ /* read in the offsets for texture2 names */
+ offsets = (i32 *) GetMemory ((long) numtex * 4);
+ dir->wadfile->read_i32 (offsets, numtex);
+ for (n = 0; n < numtex && !texofs; n++)
+ {
+ dir->wadfile->seek (dir->dir.start + offsets[n]);
+ dir->wadfile->read_bytes (&tname, WAD_TEX_NAME);
+ if (!y_strnicmp (tname, name, WAD_TEX_NAME))
+ texofs = dir->dir.start + offsets[n];
+ }
+ FreeMemory (offsets);
+ }
+ }
+ }
+else
+ nf_bug ("Invalid texture_format/texture_lumps combination.");
+
+/* texture name not found */
+if (texofs == 0)
+ return 0;
+
+/* read the info for this texture */
+i32 header_ofs;
+if (yg_texture_format == YGTF_NAMELESS)
+ header_ofs = texofs;
+else
+ header_ofs = texofs + WAD_TEX_NAME;
+dir->wadfile->seek (header_ofs + 4);
+dir->wadfile->read_i16 (&width);
+dir->wadfile->read_i16 (&height);
+if (have_dummy_bytes)
+ {
+ i16 dummy;
+ dir->wadfile->read_i16 (&dummy);
+ dir->wadfile->read_i16 (&dummy);
+ }
+dir->wadfile->read_i16 (&npatches);
+
+/* Compose the texture */
+Img *texbuf = new Img (width, height, false);
+
+/* Paste onto the buffer all the patches that the texture is
+ made of. */
+for (n = 0; n < npatches; n++)
+ {
+ i16 xofs, yofs; // offset in texture space for the patch
+ i16 pnameind; // index of patch in PNAMES
+
+ dir->wadfile->seek (header_ofs + header_size + (long) n * item_size);
+ dir->wadfile->read_i16 (&xofs);
+ dir->wadfile->read_i16 (&yofs);
+ dir->wadfile->read_i16 (&pnameind);
+
+ if (have_dummy_bytes)
+ {
+ i16 stepdir;
+ i16 colormap;
+ dir->wadfile->read_i16 (&stepdir); // Always 1, unused.
+ dir->wadfile->read_i16 (&colormap); // Always 0, unused.
+ }
+
+ /* AYM 1998-08-08: Yes, that's weird but that's what Doom
+ does. Without these two lines, the few textures that have
+ patches with negative y-offsets (BIGDOOR7, SKY1, TEKWALL1,
+ TEKWALL5 and a few others) would not look in the texture
+ viewer quite like in Doom. This should be mentioned in
+ the UDS, by the way. */
+ if (yofs < 0)
+ yofs = 0;
+
+ Lump_loc loc;
+ {
+ wad_pic_name_t *wname = patch_dir.name_for_num (pnameind);
+ if (wname == 0)
+ {
+ warn ("texture \"%.*s\": patch %2d has bad index %d.\n",
+ WAD_TEX_NAME, tname, (int) n, (int) pnameind);
+ continue;
+ }
+ patch_dir.loc_by_name ((const char *) *wname, loc);
+ *picname = '\0';
+ strncat (picname, (const char *) *wname, sizeof picname - 1);
+ }
+
+ if (LoadPicture (*texbuf, picname, loc, xofs, yofs, 0, 0))
+ warn ("texture \"%.*s\": patch \"%.*s\" not found.\n",
+ WAD_TEX_NAME, tname, WAD_PIC_NAME, picname);
+ }
+
+return texbuf;
+}
+
+
+/* --- ImageCache methods --- */
+
+
+Img *ImageCache::GetFlat (const wad_flat_name_t& fname)
+{
+std::string f_str = WadToString(fname);
+
+flat_map_t::iterator P = flats.find (f_str);
+
+if (P != flats.end ())
+ return P->second;
+
+// flat not in the list yet. Add it.
+
+Img *result = Flat2Img (fname);
+flats[f_str] = result;
+
+// note that a NULL return from Flat2Img is OK, it means that no
+// such flat exists. Our renderer will revert to using a solid
+// colour.
+
+return result;
+}
+
+
+Img *ImageCache::GetTex (const wad_tex_name_t& tname)
+{
+if (tname[0] == 0 || tname[0] == '-')
+ return 0;
+
+std::string t_str = WadToString(tname);
+
+tex_map_t::iterator P = textures.find (t_str);
+
+if (P != textures.end ())
+ return P->second;
+
+// texture not in the list yet. Add it.
+
+Img *result = Tex2Img (tname);
+textures[t_str] = result;
+
+// note that a NULL return from Tex2Img is OK, it means that no
+// such texture exists. Our renderer will revert to using a solid
+// colour.
+
+return result;
+}
+
+
+Img *ImageCache::GetSprite (const wad_ttype_t& type)
+{
+sprite_map_t::iterator P = sprites.find (type);
+
+if (P != sprites.end ())
+ return P->second;
+
+// sprite not in the list yet. Add it.
+
+Img *result = 0;
+
+const char *sprite_root = get_thing_sprite (type);
+if (sprite_root)
+ {
+ Lump_loc loc;
+ wad_res.sprites.loc_by_root (sprite_root, loc);
+ result = new Img ();
+
+ if (LoadPicture (*result, sprite_root, loc, 0, 0) != 0)
+ {
+ delete result;
+ result = 0;
+ }
+ }
+
+// note that a NULL image is OK. Our renderer will just ignore the
+// missing sprite.
+
+sprites[type] = result;
+return result;
+}
diff -U4 -r -N yadex-1.7.0/src/r_images.h yadex-1.7.0-aja/src/r_images.h
--- yadex-1.7.0/src/r_images.h 1970-01-01 10:00:00.000000000 +1000
+++ yadex-1.7.0-aja/src/r_images.h 2004-01-04 14:04:42.000000000 +1100
@@ -0,0 +1,69 @@
+/*
+ * r_images.h
+ * AJA 2002-04-27
+ */
+
+
+#ifndef YH_R_IMAGES /* DO NOT INSERT ANYTHING BEFORE THIS LINE */
+#define YH_R_IMAGES
+
+
+#include