qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-30 12:40:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

do some cleanup on modelgen before getting into some hacking

Browse source
This commit is contained in:
Bill Currie 2005-01-24 12:39:16 +00:00
parent b209e8607e
commit 114843d7b8
9 changed files with 246 additions and 1070 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/qfmodelgen/include/Makefile.am
View file

@ -1,3 +1,3 @@
AUTOMAKE_OPTIONS= foreign AUTOMAKE_OPTIONS= foreign
EXTRA_DIST= cmdlib.h lbmlib.h scriplib.h trilib.h EXTRA_DIST= lbmlib.h trilib.h

105
tools/qfmodelgen/include/cmdlib.h
View file

@ -1,105 +0,0 @@
/* Copyright (C) 1996-1997 Id Software, Inc.
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
See file, 'COPYING', for details.
*/
// cmdlib.h
#ifndef __CMDLIB__
#define __CMDLIB__
#include <stdio.h>
#include <string.h>
#include <stdlib.h>
#include <errno.h>
#include <ctype.h>
#include <time.h>
#include <stdarg.h>
#include "QF/qtypes.h"
#include "QF/quakeio.h"
// the dec offsetof macro doesn't work very well...
#define myoffsetof(type,identifier) ((size_t)&((type *)0)->identifier)
// set these before calling CheckParm
extern int myargc;
extern char **myargv;
char *strupr (char *in);
char *strlower (char *in);
int Q_strncasecmp (const char *s1, const char *s2, int n);
int Q_strcasecmp (const char *s1, const char *s2);
void Q_getwd (char *out);
int FileTime (char *path);
void Q_mkdir (char *path);
extern char qdir[1024];
extern char gamedir[1024];
void SetQdirFromPath (char *path);
const char *ExpandPath (const char *path);
const char *ExpandPathAndArchive (const char *path);
double I_FloatTime (void);
void Error (const char *error, ...);
int CheckParm (const char *check);
QFile *SafeOpenWrite (const char *filename);
QFile *SafeOpenRead (const char *filename);
void SafeRead (QFile *f, void *buffer, int count);
void SafeWrite (QFile *f, void *buffer, int count);
int LoadFile (const char *filename, void **bufferptr);
void SaveFile (const char *filename, void *buffer, int count);
void DefaultExtension (char *path, const char *extension);
void DefaultPath (char *path, char *basepath);
void StripFilename (char *path);
void StripExtension (char *path);
void ExtractFilePath (char *path, char *dest);
void ExtractFileBase (char *path, char *dest);
void ExtractFileExtension (char *path, char *dest);
int ParseNum (char *str);
char *COM_Parse (char *data);
extern char com_token[1024];
extern qboolean com_eof;
char *copystring(const char *s);
void CRC_Init(unsigned short *crcvalue);
void CRC_ProcessByte(unsigned short *crcvalue, byte data);
unsigned short CRC_Value(unsigned short crcvalue);
void CreatePath (const char *path);
void CopyFile (const char *from, const char *to);
extern qboolean archive;
extern char archivedir[1024];
#endif

40
tools/qfmodelgen/include/scriplib.h
View file

@ -1,40 +0,0 @@
/* Copyright (C) 1996-1997 Id Software, Inc.
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
See file, 'COPYING', for details.
*/
// scriplib.h
#ifndef __CMDLIB__
#include "cmdlib.h"
#endif
#define MAXTOKEN 128
extern char token[MAXTOKEN];
extern char *scriptbuffer,*script_p,*scriptend_p;
extern int grabbed;
extern int scriptline;
extern qboolean endofscript;
void LoadScriptFile (char *filename);
qboolean GetToken (qboolean crossline);
void UnGetToken (void);
qboolean TokenAvailable (void);

2
tools/qfmodelgen/source/Makefile.am
View file

@ -15,7 +15,7 @@ endif
bin_PROGRAMS= $(qfmodelgen) bin_PROGRAMS= $(qfmodelgen)
EXTRA_PROGRAMS= qfmodelgen EXTRA_PROGRAMS= qfmodelgen
qfmodelgen_SOURCES= cmdlib.c lbmlib.c modelgen.c scriplib.c trilib.c qfmodelgen_SOURCES= lbmlib.c modelgen.c trilib.c
qfmodelgen_LDADD= $(QFMODELGEN_LIBS) qfmodelgen_LDADD= $(QFMODELGEN_LIBS)
qfmodelgen_DEPENDENCIES= $(QFMODELGEN_DEPS) qfmodelgen_DEPENDENCIES= $(QFMODELGEN_DEPS)

641
tools/qfmodelgen/source/cmdlib.c
View file

@ -1,641 +0,0 @@
/* Copyright (C) 1996-1997 Id Software, Inc.
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
See file, 'COPYING', for details.
*/
// cmdlib.c
#include "config.h"
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include <sys/types.h>
#include <sys/stat.h>
#include "cmdlib.h"
#ifdef _WIN32
#include <direct.h>
#endif
#ifdef NeXT
#include <libc.h>
#endif
#define PATHSEPERATOR '/'
// set these before calling CheckParm
int myargc;
char **myargv;
qboolean com_eof;
qboolean archive;
char archivedir[1024];
/*
qdir will hold the path up to the quake directory, including the slash
f:\quake\
/raid/quake/
gamedir will hold qdir + the game directory (id1, id2, etc)
*/
char qdir[1024];
char gamedir[1024];
void
SetQdirFromPath (char *path)
{
char temp[1024];
char *c;
if (!(path[0] == '/' || path[0] == '\\' || path[1] == ':'))
{ // path is partial
Q_getwd (temp);
strcat (temp, path);
path = temp;
}
// search for "quake" in path
for (c=path ; *c ; c++)
if (!Q_strncasecmp (c, "quake", 5)) {
strncpy (qdir, path, c+6-path);
printf ("qdir: %s\n", qdir);
c += 6;
while (*c) {
if (*c == '/' || *c == '\\') {
strncpy (gamedir, path, c+1-path);
printf ("gamedir: %s\n", gamedir);
return;
}
c++;
}
Error ("No gamedir in %s", path);
return;
}
Error ("SetQdirFromPath: no 'quake' in %s", path);
}
const char *
ExpandPath (const char *path)
{
static char full[1024];
if (!qdir)
Error ("ExpandPath called without qdir set");
if (path[0] == '/' || path[0] == '\\' || path[1] == ':')
return path;
sprintf (full, "%s%s", qdir, path);
return full;
}
const char *
ExpandPathAndArchive (const char *path)
{
const char *expanded;
char archivename[1024];
expanded = ExpandPath (path);
if (archive) {
sprintf (archivename, "%s/%s", archivedir, path);
CopyFile (expanded, archivename);
}
return expanded;
}
char *
copystring(const char *s)
{
char *b;
b = malloc (strlen (s) + 1);
strcpy (b, s);
return b;
}
double
I_FloatTime (void)
{
time_t t;
time (&t);
return t;
#if 0
// more precise, less portable
struct timeval tp;
struct timezone tzp;
static int secbase;
gettimeofday (&tp, &tzp);
if (!secbase) {
secbase = tp.tv_sec;
return tp.tv_usec/1000000.0;
}
return (tp.tv_sec - secbase) + tp.tv_usec / 1000000.0;
#endif
}
void
Q_getwd (char *out)
{
#ifdef _WIN32
_getcwd (out, 256);
strcat (out, "\\");
#else
getcwd (out, 256);
#endif
}
void
Q_mkdir (char *path)
{
#ifdef _WIN32
if (_mkdir (path) != -1)
return;
#else
if (mkdir (path, 0777) != -1)
return;
#endif
if (errno != EEXIST)
Error ("mkdir %s: %s",path, strerror(errno));
}
/*
============
FileTime
returns -1 if not present
============
*/
int
FileTime (char *path)
{
struct stat buf;
if (stat (path,&buf) == -1)
return -1;
return buf.st_mtime;
}
int
Q_strncasecmp (const char *s1, const char *s2, int n)
{
int c1, c2;
while (1) {
c1 = *s1++;
c2 = *s2++;
if (!n--)
return 0; // strings are equal until end point
if (c1 != c2) {
if (c1 >= 'a' && c1 <= 'z')
c1 -= ('a' - 'A');
if (c2 >= 'a' && c2 <= 'z')
c2 -= ('a' - 'A');
if (c1 != c2)
return -1; // strings not equal
}
if (!c1)
return 0; // strings are equal
}
return -1;
}
int
Q_strcasecmp (const char *s1, const char *s2)
{
return Q_strncasecmp (s1, s2, 99999);
}
char *
strupr (char *start)
{
char *in;
in = start;
while (*in) {
*in = toupper (*in);
in++;
}
return start;
}
char *
strlower (char *start)
{
char *in;
in = start;
while (*in) {
*in = tolower (*in);
in++;
}
return start;
}
/*
=============================================================================
MISC FUNCTIONS
=============================================================================
*/
/*
=================
CheckParm
Checks for the given parameter in the program's command line arguments
Returns the argument number (1 to argc-1) or 0 if not present
=================
*/
int
CheckParm (const char *check)
{
int i;
for (i = 1; i < myargc; i++) {
if (!Q_strcasecmp (check, myargv[i]))
return i;
}
return 0;
}
QFile *
SafeOpenWrite (const char *filename)
{
QFile *f;
f = Qopen(filename, "wb");
if (!f)
Error ("Error opening %s: %s",filename,strerror(errno));
return f;
}
QFile *
SafeOpenRead (const char *filename)
{
QFile *f;
f = Qopen(filename, "rb");
if (!f)
Error ("Error opening %s: %s",filename,strerror(errno));
return f;
}
void
SafeRead (QFile *f, void *buffer, int count)
{
if (Qread (f, buffer, count) != count)
Error ("File read failure");
}
void
SafeWrite (QFile *f, void *buffer, int count)
{
if (Qwrite (f, buffer, count) != count)
Error ("File read failure");
}
void
SaveFile (const char *filename, void *buffer, int count)
{
QFile *f;
f = SafeOpenWrite (filename);
SafeWrite (f, buffer, count);
Qclose (f);
}
void
DefaultExtension (char *path, const char *extension)
{
char *src;
// if path doesn't have a .EXT, append extension
// (extension should include the .)
src = path + strlen (path) - 1;
while (*src != PATHSEPERATOR && src != path) {
if (*src == '.')
return; // it has an extension
src--;
}
strcat (path, extension);
}
void
DefaultPath (char *path, char *basepath)
{
char temp[128];
if (path[0] == PATHSEPERATOR)
return; // absolute path location
strcpy (temp, path);
strcpy (path, basepath);
strcat (path, temp);
}
void
StripFilename (char *path)
{
int length;
length = strlen (path) - 1;
while (length > 0 && path[length] != PATHSEPERATOR)
length--;
path[length] = 0;
}
void
StripExtension (char *path)
{
int length;
length = strlen (path) - 1;
while (length > 0 && path[length] != '.') {
length--;
if (path[length] == '/')
return; // no extension
}
if (length)
path[length] = 0;
}
/*
====================
Extract file parts
====================
*/
void
ExtractFilePath (char *path, char *dest)
{
char *src;
src = path + strlen(path) - 1;
// back up until a \ or the start
while (src != path && *(src-1) != PATHSEPERATOR)
src--;
memcpy (dest, path, src-path);
dest[src-path] = 0;
}
void
ExtractFileBase (char *path, char *dest)
{
char *src;
src = path + strlen(path) - 1;
// back up until a \ or the start
while (src != path && *(src-1) != PATHSEPERATOR)
src--;
while (*src && *src != '.') {
*dest++ = *src++;
}
*dest = 0;
}
void
ExtractFileExtension (char *path, char *dest)
{
char *src;
src = path + strlen(path) - 1;
// back up until a . or the start
while (src != path && *(src-1) != '.')
src--;
if (src == path) {
*dest = 0; // no extension
return;
}
strcpy (dest,src);
}
static int
ParseHex (char *hex)
{
char *str;
int num;
num = 0;
str = hex;
while (*str) {
num <<= 4;
if (*str >= '0' && *str <= '9')
num += *str - '0';
else if (*str >= 'a' && *str <= 'f')
num += 10 + *str - 'a';
else if (*str >= 'A' && *str <= 'F')
num += 10 + *str - 'A';
else
Error ("Bad hex number: %s",hex);
str++;
}
return num;
}
int
ParseNum (char *str)
{
if (str[0] == '$')
return ParseHex (str + 1);
if (str[0] == '0' && str[1] == 'x')
return ParseHex (str + 2);
return atol (str);
}
/*
============================================================================
BYTE ORDER FUNCTIONS
============================================================================
*/
//=======================================================
// FIXME: byte swap?
// this is a 16 bit, non-reflected CRC using the polynomial 0x1021
// and the initial and final xor values shown below... in other words, the
// CCITT standard CRC used by XMODEM
#define CRC_INIT_VALUE 0xffff
#define CRC_XOR_VALUE 0x0000
static unsigned short crctable[256] =
{
0x0000, 0x1021, 0x2042, 0x3063, 0x4084, 0x50a5, 0x60c6, 0x70e7,
0x8108, 0x9129, 0xa14a, 0xb16b, 0xc18c, 0xd1ad, 0xe1ce, 0xf1ef,
0x1231, 0x0210, 0x3273, 0x2252, 0x52b5, 0x4294, 0x72f7, 0x62d6,
0x9339, 0x8318, 0xb37b, 0xa35a, 0xd3bd, 0xc39c, 0xf3ff, 0xe3de,
0x2462, 0x3443, 0x0420, 0x1401, 0x64e6, 0x74c7, 0x44a4, 0x5485,
0xa56a, 0xb54b, 0x8528, 0x9509, 0xe5ee, 0xf5cf, 0xc5ac, 0xd58d,
0x3653, 0x2672, 0x1611, 0x0630, 0x76d7, 0x66f6, 0x5695, 0x46b4,
0xb75b, 0xa77a, 0x9719, 0x8738, 0xf7df, 0xe7fe, 0xd79d, 0xc7bc,
0x48c4, 0x58e5, 0x6886, 0x78a7, 0x0840, 0x1861, 0x2802, 0x3823,
0xc9cc, 0xd9ed, 0xe98e, 0xf9af, 0x8948, 0x9969, 0xa90a, 0xb92b,
0x5af5, 0x4ad4, 0x7ab7, 0x6a96, 0x1a71, 0x0a50, 0x3a33, 0x2a12,
0xdbfd, 0xcbdc, 0xfbbf, 0xeb9e, 0x9b79, 0x8b58, 0xbb3b, 0xab1a,
0x6ca6, 0x7c87, 0x4ce4, 0x5cc5, 0x2c22, 0x3c03, 0x0c60, 0x1c41,
0xedae, 0xfd8f, 0xcdec, 0xddcd, 0xad2a, 0xbd0b, 0x8d68, 0x9d49,
0x7e97, 0x6eb6, 0x5ed5, 0x4ef4, 0x3e13, 0x2e32, 0x1e51, 0x0e70,
0xff9f, 0xefbe, 0xdfdd, 0xcffc, 0xbf1b, 0xaf3a, 0x9f59, 0x8f78,
0x9188, 0x81a9, 0xb1ca, 0xa1eb, 0xd10c, 0xc12d, 0xf14e, 0xe16f,
0x1080, 0x00a1, 0x30c2, 0x20e3, 0x5004, 0x4025, 0x7046, 0x6067,
0x83b9, 0x9398, 0xa3fb, 0xb3da, 0xc33d, 0xd31c, 0xe37f, 0xf35e,
0x02b1, 0x1290, 0x22f3, 0x32d2, 0x4235, 0x5214, 0x6277, 0x7256,
0xb5ea, 0xa5cb, 0x95a8, 0x8589, 0xf56e, 0xe54f, 0xd52c, 0xc50d,
0x34e2, 0x24c3, 0x14a0, 0x0481, 0x7466, 0x6447, 0x5424, 0x4405,
0xa7db, 0xb7fa, 0x8799, 0x97b8, 0xe75f, 0xf77e, 0xc71d, 0xd73c,
0x26d3, 0x36f2, 0x0691, 0x16b0, 0x6657, 0x7676, 0x4615, 0x5634,
0xd94c, 0xc96d, 0xf90e, 0xe92f, 0x99c8, 0x89e9, 0xb98a, 0xa9ab,
0x5844, 0x4865, 0x7806, 0x6827, 0x18c0, 0x08e1, 0x3882, 0x28a3,
0xcb7d, 0xdb5c, 0xeb3f, 0xfb1e, 0x8bf9, 0x9bd8, 0xabbb, 0xbb9a,
0x4a75, 0x5a54, 0x6a37, 0x7a16, 0x0af1, 0x1ad0, 0x2ab3, 0x3a92,
0xfd2e, 0xed0f, 0xdd6c, 0xcd4d, 0xbdaa, 0xad8b, 0x9de8, 0x8dc9,
0x7c26, 0x6c07, 0x5c64, 0x4c45, 0x3ca2, 0x2c83, 0x1ce0, 0x0cc1,
0xef1f, 0xff3e, 0xcf5d, 0xdf7c, 0xaf9b, 0xbfba, 0x8fd9, 0x9ff8,
0x6e17, 0x7e36, 0x4e55, 0x5e74, 0x2e93, 0x3eb2, 0x0ed1, 0x1ef0
};
void
CRC_Init (unsigned short *crcvalue)
{
*crcvalue = CRC_INIT_VALUE;
}
void
CRC_ProcessByte (unsigned short *crcvalue, byte data)
{
*crcvalue = (*crcvalue << 8) ^ crctable[(*crcvalue >> 8) ^ data];
}
unsigned short
CRC_Value (unsigned short crcvalue)
{
return crcvalue ^ CRC_XOR_VALUE;
}
//=============================================================================
void
CreatePath (const char *_path)
{
char *path = strdup (_path);
char *ofs, c;
for (ofs = path+1 ; *ofs ; ofs++) {
c = *ofs;
if (c == '/' || c == '\\')
{ // create the directory
*ofs = 0;
Q_mkdir (path);
*ofs = c;
}
}
free (path);
}
int
LoadFile (const char *fname, void **buf)
{
QFile *file;
char *src;
int len;
*buf = 0;
file = Qopen (fname, "rt");
if (!file)
return 0;
len = Qfilesize (file);
src = malloc (len + 1);
src[Qfilesize (file)] = 0;
Qread (file, src, len);
Qclose (file);
*buf = src;
return len;
}
/*
============
CopyFile
Used to archive source files
============
*/
void
CopyFile (const char *from, const char *to)
{
void *buffer;
int length;
length = LoadFile (from, &buffer);
CreatePath (to);
SaveFile (to, buffer, length);
free (buffer);
}
/*
=================
Error
For abnormal program terminations
=================
*/
void
Error (const char *error, ...)
{
va_list argptr;
printf ("************ ERROR ************\n");
va_start (argptr, error);
vprintf (error, argptr);
va_end (argptr);
printf ("\n");
exit (1);
}

66
tools/qfmodelgen/source/lbmlib.c
View file

@ -18,12 +18,68 @@
*/ */
// lbmlib.c // lbmlib.c
#include "config.h"
#include <string.h>
#include <malloc.h>
#include <errno.h>
#include "QF/qendian.h" #include "QF/qendian.h"
#include "QF/quakeio.h"
#include "QF/sys.h"
#include "cmdlib.h"
#include "lbmlib.h" #include "lbmlib.h"
static int
LoadFile (const char *fname, void **buf)
{
QFile *file;
char *src;
int len;
*buf = 0;
file = Qopen (fname, "rt");
if (!file)
return 0;
len = Qfilesize (file);
src = malloc (len + 1);
src[Qfilesize (file)] = 0;
Qread (file, src, len);
Qclose (file);
*buf = src;
return len;
}
static QFile *
SafeOpenWrite (const char *filename)
{
QFile *f;
f = Qopen(filename, "wb");
if (!f)
Sys_Error ("Error opening %s: %s",filename,strerror(errno));
return f;
}
static void
SafeWrite (QFile *f, void *buffer, int count)
{
if (Qwrite (f, buffer, count) != count)
Sys_Error ("File read failure");
}
static void
SaveFile (const char *filename, void *buffer, int count)
{
QFile *f;
f = SafeOpenWrite (filename);
SafeWrite (f, buffer, count);
Qclose (f);
}
/* /*
============================================================================ ============================================================================
@ -86,7 +142,7 @@ LBMRLEDecompress (byte *source, byte *unpacked, int bpwidth)
} while (count < bpwidth); } while (count < bpwidth);
if (count > bpwidth) if (count > bpwidth)
Error ("Decompression exceeded width!\n"); Sys_Error ("Decompression exceeded width!\n");
return source; return source;
@ -292,7 +348,7 @@ LoadLBM (char *filename, byte **picture, byte **palette)
// parse the LBM header // parse the LBM header
LBM_P = LBMbuffer; LBM_P = LBMbuffer;
if (*(int *) LBMbuffer != LittleLong (FORMID)) if (*(int *) LBMbuffer != LittleLong (FORMID))
Error ("No FORM ID at start of file!\n"); Sys_Error ("No FORM ID at start of file!\n");
LBM_P += 4; LBM_P += 4;
formlength = BigLong (*(int *) LBM_P ); formlength = BigLong (*(int *) LBM_P );
@ -302,7 +358,7 @@ LoadLBM (char *filename, byte **picture, byte **palette)
formtype = LittleLong (*(int *) LBM_P); formtype = LittleLong (*(int *) LBM_P);
if (formtype != ILBMID && formtype != PBMID) if (formtype != ILBMID && formtype != PBMID)
Error ("Unrecognized form type: %c%c%c%c\n", formtype & 0xff, Sys_Error ("Unrecognized form type: %c%c%c%c\n", formtype & 0xff,
(formtype >> 8) & 0xff, (formtype >> 16) & 0xff, (formtype >> 8) & 0xff, (formtype >> 16) & 0xff,
(formtype >> 24) & 0xff); (formtype >> 24) & 0xff);
@ -369,7 +425,7 @@ LoadLBM (char *filename, byte **picture, byte **palette)
mungecall = MungeBitPlanes8; mungecall = MungeBitPlanes8;
break; break;
default: default:
Error ("Can't munge %i bit planes!\n",bmhd.nPlanes); Sys_Error ("Can't munge %i bit planes!\n",bmhd.nPlanes);
} }
for (y = 0; y < bmhd.h; y++, pic_p += bmhd.w) { for (y = 0; y < bmhd.h; y++, pic_p += bmhd.w) {

287
tools/qfmodelgen/source/modelgen.c
View file

@ -23,17 +23,29 @@
// /raid/quake/models/<scriptname>.mdl. // /raid/quake/models/<scriptname>.mdl.
//#include <sys/stat.h> //#include <sys/stat.h>
#include "config.h"
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <errno.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#ifdef _WIN32
# include <direct.h>
#endif
#include "QF/dstring.h"
#include "QF/modelgen.h" #include "QF/modelgen.h"
#include "QF/qendian.h" #include "QF/qendian.h"
#include "QF/quakefs.h"
#include "QF/quakeio.h" #include "QF/quakeio.h"
#include "QF/script.h"
#include "QF/sys.h"
#include "cmdlib.h"
#include "lbmlib.h" #include "lbmlib.h"
#include "scriplib.h" //FIXME real parser
#include "trilib.h" #include "trilib.h"
#include "compat.h"
#define MAXVERTS 2048 #define MAXVERTS 2048
#define MAXFRAMES 256 #define MAXFRAMES 256
@ -111,6 +123,66 @@ trivertx_t tarray[MAXVERTS];
char outname[1024]; char outname[1024];
script_t scr;
/*
qdir will hold the path up to the quake directory, including the slash
f:\quake\
/raid/quake/
gamedir will hold qdir + the game directory (id1, id2, etc)
*/
char qdir[1024];
char gamedir[1024];
static void
SetQdirFromPath (char *path)
{
char temp[1024];
char *c;
if (!(path[0] == '/' || path[0] == '\\' || path[1] == ':'))
{ // path is partial
getcwd (temp, sizeof (temp));
strcat (temp, path);
path = temp;
}
// search for "quake" in path
for (c=path ; *c ; c++)
if (!strncasecmp (c, "quake", 5)) {
strncpy (qdir, path, c+6-path);
printf ("qdir: %s\n", qdir);
c += 6;
while (*c) {
if (*c == '/' || *c == '\\') {
strncpy (gamedir, path, c+1-path);
printf ("gamedir: %s\n", gamedir);
return;
}
c++;
}
Sys_Error ("No gamedir in %s", path);
return;
}
Sys_Error ("SetQdirFromPath: no 'quake' in %s", path);
}
static const char *
ExpandPath (const char *path)
{
static char full[1024];
if (!qdir)
Sys_Error ("ExpandPath called without qdir set");
if (path[0] == '/' || path[0] == '\\' || path[1] == ':')
return path;
sprintf (full, "%s%s", qdir, path);
return full;
}
static void static void
ClearModel (void) ClearModel (void)
@ -156,7 +228,7 @@ WriteFrame (QFile *modelouthandle, int framenum)
tarray[j].lightnormalindex = pframe[j].lightnormalindex; tarray[j].lightnormalindex = pframe[j].lightnormalindex;
if (tarray[j].lightnormalindex > NUMVERTEXNORMALS) if (tarray[j].lightnormalindex > NUMVERTEXNORMALS)
Error ("invalid lightnormalindex %d\n", Sys_Error ("invalid lightnormalindex %d\n",
tarray[j].lightnormalindex); tarray[j].lightnormalindex);
for (k = 0; k < 3; k++) { for (k = 0; k < 3; k++) {
@ -357,9 +429,9 @@ WriteModel (void)
} }
if (!skincount) if (!skincount)
Error ("frames with no skins\n"); Sys_Error ("frames with no skins\n");
StripExtension (outname); QFS_StripExtension (outname, outname);
strcat (outname, ".mdl"); strcat (outname, ".mdl");
printf ("---------------------\n"); printf ("---------------------\n");
@ -495,16 +567,16 @@ Cmd_Base (void)
triangle_t *ptri; triangle_t *ptri;
int time1, i, j, k; int time1, i, j, k;
GetToken (false); Script_GetToken (&scr, false);
strcpy (qbasename, token); strcpy (qbasename, scr.token->str);
sprintf (file1, "%s/%s.tri", cdpartial, token); sprintf (file1, "%s/%s.tri", cdpartial, scr.token->str);
ExpandPathAndArchive (file1); ExpandPath/*AndArchive*/ (file1);
sprintf (file1, "%s/%s.tri", cddir, token); sprintf (file1, "%s/%s.tri", cddir, scr.token->str);
time1 = FileTime (file1); time1 = Sys_FileTime (file1);
if (time1 == -1) if (time1 == -1)
Error ("%s doesn't exist", file1); Sys_Error ("%s doesn't exist", file1);
// load the base triangles // load the base triangles
LoadTriangleList (file1, &ptri, &model.numtris); LoadTriangleList (file1, &ptri, &model.numtris);
@ -550,22 +622,22 @@ Cmd_Skin (void)
byte *ppal, *pskinbitmap, *ptemp1, *ptemp2; byte *ppal, *pskinbitmap, *ptemp1, *ptemp2;
int time1, i; int time1, i;
GetToken (false); Script_GetToken (&scr, false);
strcpy (skinname, token); strcpy (skinname, scr.token->str);
sprintf (file1, "%s/%s.lbm", cdpartial, token); sprintf (file1, "%s/%s.lbm", cdpartial, scr.token->str);
ExpandPathAndArchive (file1); ExpandPath/*AndArchive*/ (file1);
sprintf (file1, "%s/%s.lbm", cddir, token); sprintf (file1, "%s/%s.lbm", cddir, scr.token->str);
time1 = FileTime (file1); time1 = Sys_FileTime (file1);
if (time1 == -1) if (time1 == -1)
Error ("%s not found", file1); Sys_Error ("%s not found", file1);
if (TokenAvailable ()) { if (Script_TokenAvailable (&scr, false)) {
GetToken (false); Script_GetToken (&scr, false);
skins[skincount].interval = atof (token); skins[skincount].interval = atof (scr.token->str);
if (skins[skincount].interval <= 0.0) if (skins[skincount].interval <= 0.0)
Error ("Non-positive interval"); Sys_Error ("Non-positive interval");
} else { } else {
skins[skincount].interval = 0.1; skins[skincount].interval = 0.1;
} }
@ -579,7 +651,7 @@ Cmd_Skin (void)
malloc (model.skinwidth * model.skinheight); malloc (model.skinwidth * model.skinheight);
if (!skins[skincount].pdata) if (!skins[skincount].pdata)
Error ("couldn't get memory for skin texture"); Sys_Error ("couldn't get memory for skin texture");
ptemp1 = skins[skincount].pdata; ptemp1 = skins[skincount].pdata;
ptemp2 = pskinbitmap; ptemp2 = pskinbitmap;
@ -593,7 +665,7 @@ Cmd_Skin (void)
skincount++; skincount++;
if (skincount > MAXSKINS) if (skincount > MAXSKINS)
Error ("Too many skins; increase MAXSKINS"); Sys_Error ("Too many skins; increase MAXSKINS");
} }
static void static void
@ -604,12 +676,12 @@ GrabFrame (char *frame, int isgroup)
trivert_t *ptrivert; trivert_t *ptrivert;
sprintf (file1, "%s/%s.tri", cdpartial, frame); sprintf (file1, "%s/%s.tri", cdpartial, frame);
ExpandPathAndArchive (file1); ExpandPath/*AndArchive*/ (file1);
sprintf (file1, "%s/%s.tri", cddir, frame); sprintf (file1, "%s/%s.tri", cddir, frame);
time1 = FileTime (file1); time1 = Sys_FileTime (file1);
if (time1 == -1) if (time1 == -1)
Error ("%s does not exist", file1); Sys_Error ("%s does not exist", file1);
printf ("grabbing %s\n", file1); printf ("grabbing %s\n", file1);
frames[framecount].interval = 0.1; frames[framecount].interval = 0.1;
@ -619,14 +691,14 @@ GrabFrame (char *frame, int isgroup)
LoadTriangleList (file1, &ptri, &numtris); LoadTriangleList (file1, &ptri, &numtris);
if (numtris != model.numtris) if (numtris != model.numtris)
Error ("number of triangles doesn't match\n"); Sys_Error ("number of triangles doesn't match\n");
// set the intervals // set the intervals
if (isgroup && TokenAvailable ()) { if (isgroup && Script_TokenAvailable (&scr, false)) {
GetToken (false); Script_GetToken (&scr, false);
frames[framecount].interval = atof (token); frames[framecount].interval = atof (scr.token->str);
if (frames[framecount].interval <= 0.0) if (frames[framecount].interval <= 0.0)
Error ("Non-positive interval %s %f", token, Sys_Error ("Non-positive interval %s %f", scr.token->str,
frames[framecount].interval); frames[framecount].interval);
} else { } else {
frames[framecount].interval = 0.1; frames[framecount].interval = 0.1;
@ -726,7 +798,7 @@ GrabFrame (char *frame, int isgroup)
v[j] /= vnorms[i].numnormals; v[j] /= vnorms[i].numnormals;
} }
} else { } else {
Error ("Vertex with no non-degenerate triangles attached"); Sys_Error ("Vertex with no non-degenerate triangles attached");
} }
VectorNormalize (v); VectorNormalize (v);
@ -750,7 +822,7 @@ GrabFrame (char *frame, int isgroup)
framecount++; framecount++;
if (framecount >= MAXFRAMES) if (framecount >= MAXFRAMES)
Error ("Too many frames; increase MAXFRAMES"); Sys_Error ("Too many frames; increase MAXFRAMES");
free (ptri); free (ptri);
firstframe = 0; firstframe = 0;
@ -759,9 +831,9 @@ GrabFrame (char *frame, int isgroup)
static void static void
Cmd_Frame (int isgroup) Cmd_Frame (int isgroup)
{ {
while (TokenAvailable ()) { while (Script_TokenAvailable (&scr, false)) {
GetToken (false); Script_GetToken (&scr, false);
GrabFrame (token, isgroup); GrabFrame (scr.token->str, isgroup);
if (!isgroup) if (!isgroup)
model.numframes++; model.numframes++;
@ -775,28 +847,27 @@ Cmd_SkinGroupStart (void)
groupskin = skincount++; groupskin = skincount++;
if (skincount >= MAXFRAMES) if (skincount >= MAXFRAMES)
Error ("Too many skins; increase MAXSKINS"); Sys_Error ("Too many skins; increase MAXSKINS");
skins[groupskin].type = ALIAS_SKIN_GROUP; skins[groupskin].type = ALIAS_SKIN_GROUP;
skins[groupskin].numgroupskins = 0; skins[groupskin].numgroupskins = 0;
while (1) { while (1) {
GetToken (true); if (!Script_GetToken (&scr, true))
if (endofscript) Sys_Error ("End of file during group");
Error ("End of file during group");
if (!strcmp (token, "$skin")) { if (!strcmp (scr.token->str, "$skin")) {
Cmd_Skin (); Cmd_Skin ();
skins[groupskin].numgroupskins++; skins[groupskin].numgroupskins++;
} else if (!strcmp (token, "$skingroupend")) { } else if (!strcmp (scr.token->str, "$skingroupend")) {
break; break;
} else { } else {
Error ("$skin or $skingroupend expected\n"); Sys_Error ("$skin or $skingroupend expected\n");
} }
} }
if (skins[groupskin].numgroupskins == 0) if (skins[groupskin].numgroupskins == 0)
Error ("Empty group\n"); Sys_Error ("Empty group\n");
} }
static void static void
@ -806,29 +877,28 @@ Cmd_FrameGroupStart (void)
groupframe = framecount++; groupframe = framecount++;
if (framecount >= MAXFRAMES) if (framecount >= MAXFRAMES)
Error ("Too many frames; increase MAXFRAMES"); Sys_Error ("Too many frames; increase MAXFRAMES");
frames[groupframe].type = ALIAS_GROUP; frames[groupframe].type = ALIAS_GROUP;
frames[groupframe].numgroupframes = 0; frames[groupframe].numgroupframes = 0;
while (1) { while (1) {
GetToken (true); if (!Script_GetToken (&scr, true))
if (endofscript) Sys_Error ("End of file during group");
Error ("End of file during group");
if (!strcmp (token, "$frame")) { if (!strcmp (scr.token->str, "$frame")) {
Cmd_Frame (1); Cmd_Frame (1);
} else if (!strcmp (token, "$framegroupend")) { } else if (!strcmp (scr.token->str, "$framegroupend")) {
break; break;
} else { } else {
Error ("$frame or $framegroupend expected\n"); Sys_Error ("$frame or $framegroupend expected\n");
} }
} }
frames[groupframe].numgroupframes += framecount - groupframe - 1; frames[groupframe].numgroupframes += framecount - groupframe - 1;
if (frames[groupframe].numgroupframes == 0) if (frames[groupframe].numgroupframes == 0)
Error ("Empty group\n"); Sys_Error ("Empty group\n");
} }
static void static void
@ -836,14 +906,14 @@ Cmd_Origin (void)
{ {
// rotate points into frame of reference so model points down the positive x // rotate points into frame of reference so model points down the positive x
// axis // axis
GetToken (false); Script_GetToken (&scr, false);
adjust[1] = -atof (token); adjust[1] = -atof (scr.token->str);
GetToken (false); Script_GetToken (&scr, false);
adjust[0] = atof (token); adjust[0] = atof (scr.token->str);
GetToken (false); Script_GetToken (&scr, false);
adjust[2] = -atof (token); adjust[2] = -atof (scr.token->str);
} }
static void static void
@ -851,36 +921,36 @@ Cmd_Eyeposition (void)
{ {
// rotate points into frame of reference so model points down the positive x // rotate points into frame of reference so model points down the positive x
// axis // axis
GetToken (false); Script_GetToken (&scr, false);
model.eyeposition[1] = atof (token); model.eyeposition[1] = atof (scr.token->str);
GetToken (false); Script_GetToken (&scr, false);
model.eyeposition[0] = -atof (token); model.eyeposition[0] = -atof (scr.token->str);
GetToken (false); Script_GetToken (&scr, false);
model.eyeposition[2] = atof (token); model.eyeposition[2] = atof (scr.token->str);
} }
static void static void
Cmd_ScaleUp (void) Cmd_ScaleUp (void)
{ {
GetToken (false); Script_GetToken (&scr, false);
scale_up = atof (token); scale_up = atof (scr.token->str);
} }
static void static void
Cmd_Flags (void) Cmd_Flags (void)
{ {
GetToken (false); Script_GetToken (&scr, false);
model.flags = atoi (token); model.flags = atoi (scr.token->str);
} }
static void static void
Cmd_Modelname (void) Cmd_Modelname (void)
{ {
WriteModel (); WriteModel ();
GetToken (false); Script_GetToken (&scr, false);
strcpy (outname, token); strcpy (outname, scr.token->str);
} }
static void static void
@ -888,49 +958,48 @@ ParseScript (void)
{ {
while (1) { while (1) {
do { // look for a line starting with a $ command do { // look for a line starting with a $ command
GetToken (true); if (!Script_GetToken (&scr, true))
if (endofscript)
return; return;
if (token[0] == '$') if (scr.token->str[0] == '$')
break; break;
while (TokenAvailable()) while (Script_TokenAvailable (&scr, false))
GetToken (false); Script_GetToken (&scr, false);
} while (1); } while (1);
if (!strcmp (token, "$modelname")) { if (!strcmp (scr.token->str, "$modelname")) {
Cmd_Modelname (); Cmd_Modelname ();
} else if (!strcmp (token, "$base")) { } else if (!strcmp (scr.token->str, "$base")) {
Cmd_Base (); Cmd_Base ();
} else if (!strcmp (token, "$cd")) { } else if (!strcmp (scr.token->str, "$cd")) {
if (cdset) if (cdset)
Error ("Two $cd in one model"); Sys_Error ("Two $cd in one model");
cdset = true; cdset = true;
GetToken (false); Script_GetToken (&scr, false);
strcpy (cdpartial, token); strcpy (cdpartial, scr.token->str);
strcpy (cddir, ExpandPath(token)); strcpy (cddir, ExpandPath(scr.token->str));
} else if (!strcmp (token, "$sync")) { } else if (!strcmp (scr.token->str, "$sync")) {
model.synctype = ST_SYNC; model.synctype = ST_SYNC;
} else if (!strcmp (token, "$origin")) { } else if (!strcmp (scr.token->str, "$origin")) {
Cmd_Origin (); Cmd_Origin ();
} else if (!strcmp (token, "$eyeposition")) { } else if (!strcmp (scr.token->str, "$eyeposition")) {
Cmd_Eyeposition (); Cmd_Eyeposition ();
} else if (!strcmp (token, "$scale")) { } else if (!strcmp (scr.token->str, "$scale")) {
Cmd_ScaleUp (); Cmd_ScaleUp ();
} else if (!strcmp (token, "$flags")) { } else if (!strcmp (scr.token->str, "$flags")) {
Cmd_Flags (); Cmd_Flags ();
} else if (!strcmp (token, "$frame")) { } else if (!strcmp (scr.token->str, "$frame")) {
Cmd_Frame (0); Cmd_Frame (0);
} else if (!strcmp (token, "$skin")) { } else if (!strcmp (scr.token->str, "$skin")) {
Cmd_Skin (); Cmd_Skin ();
model.numskins++; model.numskins++;
} else if (!strcmp (token, "$framegroupstart")) { } else if (!strcmp (scr.token->str, "$framegroupstart")) {
Cmd_FrameGroupStart (); Cmd_FrameGroupStart ();
model.numframes++; model.numframes++;
} else if (!strcmp (token, "$skingroupstart")) { } else if (!strcmp (scr.token->str, "$skingroupstart")) {
Cmd_SkinGroupStart (); Cmd_SkinGroupStart ();
model.numskins++; model.numskins++;
} else { } else {
Error ("bad command %s\n", token); Sys_Error ("bad command %s\n", scr.token->str);
} }
} }
} }
@ -938,25 +1007,31 @@ ParseScript (void)
int int
main (int argc, char **argv) main (int argc, char **argv)
{ {
int i; int i, bytes;
char path[1024]; char path[1024];
QFile *file;
char *buf;
if (argc != 2 && argc != 4) if (argc != 2)
Error ("usage: modelgen [-archive directory] file.qc"); Sys_Error ("usage: modelgen file.qc");
if (!strcmp(argv[1], "-archive")) { i = 1;
archive = true;
strcpy (archivedir, argv[2]);
printf ("Archiving source to: %s\n", archivedir);
i = 3;
} else
i = 1;
// load the script // load the script
strcpy (path, argv[i]); strcpy (path, argv[i]);
DefaultExtension (path, ".qc"); QFS_DefaultExtension (path, ".qc");
SetQdirFromPath (path); SetQdirFromPath (path);
LoadScriptFile (path);
file = Qopen (path, "rt");
if (!file)
Sys_Error ("couldn't open %s. %s", path, strerror(errno));
bytes = Qfilesize (file);
buf = malloc (bytes + 1);
bytes = Qread (file, buf, bytes);
buf[bytes] = 0;
Qclose (file);
Script_Start (&scr, path, buf);
// parse it // parse it
memset (&model, 0, sizeof (model)); memset (&model, 0, sizeof (model));

169
tools/qfmodelgen/source/scriplib.c
View file

@ -1,169 +0,0 @@
/* Copyright (C) 1996-1997 Id Software, Inc.
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
See file, 'COPYING', for details.
*/
// scriplib.c
#include "cmdlib.h"
#include "scriplib.h"
/*
=============================================================================
PARSING STUFF
=============================================================================
*/
char token[MAXTOKEN];
char *scriptbuffer,*script_p,*scriptend_p;
int grabbed;
int scriptline;
qboolean endofscript;
qboolean tokenready; // only true if UnGetToken was just called
void
LoadScriptFile (char *filename)
{
int size;
size = LoadFile (filename, (void **) (char *) &scriptbuffer);
script_p = scriptbuffer;
scriptend_p = script_p + size;
scriptline = 1;
endofscript = false;
tokenready = false;
}
/*
==============
UnGetToken
Signals that the current token was not used, and should be reported
for the next GetToken. Note that
GetToken (true);
UnGetToken ();
GetToken (false);
could cross a line boundary.
==============
*/
void
UnGetToken (void)
{
tokenready = true;
}
qboolean
GetToken (qboolean crossline)
{
char *token_p;
if (tokenready) { // is a token allready waiting?
tokenready = false;
return true;
}
if (script_p >= scriptend_p) {
if (!crossline)
Error ("Line %i is incomplete\n",scriptline);
endofscript = true;
return false;
}
// skip space
skipspace:
while (*script_p <= 32) {
if (script_p >= scriptend_p) {
if (!crossline)
Error ("Line %i is incomplete\n",scriptline);
endofscript = true;
return true;
}
if (*script_p++ == '\n') {
if (!crossline)
Error ("Line %i is incomplete\n",scriptline);
scriptline++;
}
}
if (script_p >= scriptend_p) {
if (!crossline)
Error ("Line %i is incomplete\n",scriptline);
endofscript = true;
return true;
}
if (*script_p == ';' || *script_p == '#') { // semicolon is comment field
// also make # a comment field
if (!crossline)
Error ("Line %i is incomplete\n",scriptline);
while (*script_p++ != '\n')
if (script_p >= scriptend_p) {
endofscript = true;
return false;
}
goto skipspace;
}
// copy token
token_p = token;
while ( *script_p > 32 && *script_p != ';') {
*token_p++ = *script_p++;
if (script_p == scriptend_p)
break;
if (token_p == &token[MAXTOKEN])
Error ("Token too large on line %i\n",scriptline);
}
*token_p = 0;
return true;
}
/*
==============
TokenAvailable
Returns true if there is another token on the line
==============
*/
qboolean
TokenAvailable (void)
{
char *search_p;
search_p = script_p;
if (search_p >= scriptend_p)
return false;
while (*search_p <= 32) {
if (*search_p == '\n')
return false;
search_p++;
if (search_p == scriptend_p)
return false;
}
if (*search_p == ';')
return false;
return true;
}

4
tools/qfmodelgen/source/trilib.c
View file

@ -25,8 +25,8 @@
#include "QF/mathlib.h" #include "QF/mathlib.h"
#include "QF/qendian.h" #include "QF/qendian.h"
#include "QF/quakeio.h" #include "QF/quakeio.h"
#include "QF/sys.h"
#include "cmdlib.h"
#include "trilib.h" #include "trilib.h"
// on disk representation of a face // on disk representation of a face
@ -170,7 +170,7 @@ LoadTriangleList (char *filename, triangle_t **pptri, int *numtriangles)
ptri++; ptri++;
if ((ptri - *pptri) >= MAXTRIANGLES) if ((ptri - *pptri) >= MAXTRIANGLES)
Error ("Error: too many triangles; increase MAXTRIANGLES\n"); Sys_Error ("Error: too many triangles; increase MAXTRIANGLES\n");
} }
} }