mirror of
https://github.com/yquake2/yquake2remaster.git
synced 2025-04-09 11:41:32 +00:00
models: parse models on client side only
Render expect parsed models/sprites only.
This commit is contained in:
Denis Pauk
parent
3ee315c7da
commit
8e054bfc3e
8 changed files with 65 additions and 5606 deletions
10
Makefile
10
Makefile
|
|
@ -1182,8 +1182,6 @@ REFGL1_OBJS_ := \
|
|||
src/client/refresh/files/surf.o \
|
||||
src/client/refresh/files/maps.o \
|
||||
src/client/refresh/files/models.o \
|
||||
src/client/refresh/files/models_md5.o \
|
||||
src/client/refresh/files/models_mdr.o \
|
||||
src/client/refresh/files/stb.o \
|
||||
src/client/refresh/files/wal.o \
|
||||
src/client/refresh/files/warp.o \
|
||||
|
|
@ -1224,8 +1222,6 @@ REFGL3_OBJS_ := \
|
|||
src/client/refresh/files/surf.o \
|
||||
src/client/refresh/files/maps.o \
|
||||
src/client/refresh/files/models.o \
|
||||
src/client/refresh/files/models_md5.o \
|
||||
src/client/refresh/files/models_mdr.o \
|
||||
src/client/refresh/files/stb.o \
|
||||
src/client/refresh/files/wal.o \
|
||||
src/client/refresh/files/warp.o \
|
||||
|
|
@ -1269,8 +1265,6 @@ REFGL4_OBJS_ := \
|
|||
src/client/refresh/files/surf.o \
|
||||
src/client/refresh/files/maps.o \
|
||||
src/client/refresh/files/models.o \
|
||||
src/client/refresh/files/models_md5.o \
|
||||
src/client/refresh/files/models_mdr.o \
|
||||
src/client/refresh/files/stb.o \
|
||||
src/client/refresh/files/wal.o \
|
||||
src/client/refresh/files/warp.o \
|
||||
|
|
@ -1315,8 +1309,6 @@ REFSOFT_OBJS_ := \
|
|||
src/client/refresh/files/surf.o \
|
||||
src/client/refresh/files/maps.o \
|
||||
src/client/refresh/files/models.o \
|
||||
src/client/refresh/files/models_md5.o \
|
||||
src/client/refresh/files/models_mdr.o \
|
||||
src/client/refresh/files/stb.o \
|
||||
src/client/refresh/files/wal.o \
|
||||
src/client/refresh/files/warp.o \
|
||||
|
|
@ -1361,8 +1353,6 @@ REFVK_OBJS_ := \
|
|||
src/client/refresh/files/surf.o \
|
||||
src/client/refresh/files/maps.o \
|
||||
src/client/refresh/files/models.o \
|
||||
src/client/refresh/files/models_md5.o \
|
||||
src/client/refresh/files/models_mdr.o \
|
||||
src/client/refresh/files/stb.o \
|
||||
src/client/refresh/files/wal.o \
|
||||
src/client/refresh/files/warp.o \
|
||||
|
|
|
|||
|
|
@ -1,188 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 1997-2001 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.
|
||||
*
|
||||
* =======================================================================
|
||||
*
|
||||
* Precalculates anormal values
|
||||
*
|
||||
* =======================================================================
|
||||
*/
|
||||
|
||||
{ -0.525731, 0.000000, 0.850651 },
|
||||
{ -0.442863, 0.238856, 0.864188 },
|
||||
{ -0.295242, 0.000000, 0.955423 },
|
||||
{ -0.309017, 0.500000, 0.809017 },
|
||||
{ -0.162460, 0.262866, 0.951056 },
|
||||
{ 0.000000, 0.000000, 1.000000 },
|
||||
{ 0.000000, 0.850651, 0.525731 },
|
||||
{ -0.147621, 0.716567, 0.681718 },
|
||||
{ 0.147621, 0.716567, 0.681718 },
|
||||
{ 0.000000, 0.525731, 0.850651 },
|
||||
{ 0.309017, 0.500000, 0.809017 },
|
||||
{ 0.525731, 0.000000, 0.850651 },
|
||||
{ 0.295242, 0.000000, 0.955423 },
|
||||
{ 0.442863, 0.238856, 0.864188 },
|
||||
{ 0.162460, 0.262866, 0.951056 },
|
||||
{ -0.681718, 0.147621, 0.716567 },
|
||||
{ -0.809017, 0.309017, 0.500000 },
|
||||
{ -0.587785, 0.425325, 0.688191 },
|
||||
{ -0.850651, 0.525731, 0.000000 },
|
||||
{ -0.864188, 0.442863, 0.238856 },
|
||||
{ -0.716567, 0.681718, 0.147621 },
|
||||
{ -0.688191, 0.587785, 0.425325 },
|
||||
{ -0.500000, 0.809017, 0.309017 },
|
||||
{ -0.238856, 0.864188, 0.442863 },
|
||||
{ -0.425325, 0.688191, 0.587785 },
|
||||
{ -0.716567, 0.681718, -0.147621 },
|
||||
{ -0.500000, 0.809017, -0.309017 },
|
||||
{ -0.525731, 0.850651, 0.000000 },
|
||||
{ 0.000000, 0.850651, -0.525731 },
|
||||
{ -0.238856, 0.864188, -0.442863 },
|
||||
{ 0.000000, 0.955423, -0.295242 },
|
||||
{ -0.262866, 0.951056, -0.162460 },
|
||||
{ 0.000000, 1.000000, 0.000000 },
|
||||
{ 0.000000, 0.955423, 0.295242 },
|
||||
{ -0.262866, 0.951056, 0.162460 },
|
||||
{ 0.238856, 0.864188, 0.442863 },
|
||||
{ 0.262866, 0.951056, 0.162460 },
|
||||
{ 0.500000, 0.809017, 0.309017 },
|
||||
{ 0.238856, 0.864188, -0.442863 },
|
||||
{ 0.262866, 0.951056, -0.162460 },
|
||||
{ 0.500000, 0.809017, -0.309017 },
|
||||
{ 0.850651, 0.525731, 0.000000 },
|
||||
{ 0.716567, 0.681718, 0.147621 },
|
||||
{ 0.716567, 0.681718, -0.147621 },
|
||||
{ 0.525731, 0.850651, 0.000000 },
|
||||
{ 0.425325, 0.688191, 0.587785 },
|
||||
{ 0.864188, 0.442863, 0.238856 },
|
||||
{ 0.688191, 0.587785, 0.425325 },
|
||||
{ 0.809017, 0.309017, 0.500000 },
|
||||
{ 0.681718, 0.147621, 0.716567 },
|
||||
{ 0.587785, 0.425325, 0.688191 },
|
||||
{ 0.955423, 0.295242, 0.000000 },
|
||||
{ 1.000000, 0.000000, 0.000000 },
|
||||
{ 0.951056, 0.162460, 0.262866 },
|
||||
{ 0.850651, -0.525731, 0.000000 },
|
||||
{ 0.955423, -0.295242, 0.000000 },
|
||||
{ 0.864188, -0.442863, 0.238856 },
|
||||
{ 0.951056, -0.162460, 0.262866 },
|
||||
{ 0.809017, -0.309017, 0.500000 },
|
||||
{ 0.681718, -0.147621, 0.716567 },
|
||||
{ 0.850651, 0.000000, 0.525731 },
|
||||
{ 0.864188, 0.442863, -0.238856 },
|
||||
{ 0.809017, 0.309017, -0.500000 },
|
||||
{ 0.951056, 0.162460, -0.262866 },
|
||||
{ 0.525731, 0.000000, -0.850651 },
|
||||
{ 0.681718, 0.147621, -0.716567 },
|
||||
{ 0.681718, -0.147621, -0.716567 },
|
||||
{ 0.850651, 0.000000, -0.525731 },
|
||||
{ 0.809017, -0.309017, -0.500000 },
|
||||
{ 0.864188, -0.442863, -0.238856 },
|
||||
{ 0.951056, -0.162460, -0.262866 },
|
||||
{ 0.147621, 0.716567, -0.681718 },
|
||||
{ 0.309017, 0.500000, -0.809017 },
|
||||
{ 0.425325, 0.688191, -0.587785 },
|
||||
{ 0.442863, 0.238856, -0.864188 },
|
||||
{ 0.587785, 0.425325, -0.688191 },
|
||||
{ 0.688191, 0.587785, -0.425325 },
|
||||
{ -0.147621, 0.716567, -0.681718 },
|
||||
{ -0.309017, 0.500000, -0.809017 },
|
||||
{ 0.000000, 0.525731, -0.850651 },
|
||||
{ -0.525731, 0.000000, -0.850651 },
|
||||
{ -0.442863, 0.238856, -0.864188 },
|
||||
{ -0.295242, 0.000000, -0.955423 },
|
||||
{ -0.162460, 0.262866, -0.951056 },
|
||||
{ 0.000000, 0.000000, -1.000000 },
|
||||
{ 0.295242, 0.000000, -0.955423 },
|
||||
{ 0.162460, 0.262866, -0.951056 },
|
||||
{ -0.442863, -0.238856, -0.864188 },
|
||||
{ -0.309017, -0.500000, -0.809017 },
|
||||
{ -0.162460, -0.262866, -0.951056 },
|
||||
{ 0.000000, -0.850651, -0.525731 },
|
||||
{ -0.147621, -0.716567, -0.681718 },
|
||||
{ 0.147621, -0.716567, -0.681718 },
|
||||
{ 0.000000, -0.525731, -0.850651 },
|
||||
{ 0.309017, -0.500000, -0.809017 },
|
||||
{ 0.442863, -0.238856, -0.864188 },
|
||||
{ 0.162460, -0.262866, -0.951056 },
|
||||
{ 0.238856, -0.864188, -0.442863 },
|
||||
{ 0.500000, -0.809017, -0.309017 },
|
||||
{ 0.425325, -0.688191, -0.587785 },
|
||||
{ 0.716567, -0.681718, -0.147621 },
|
||||
{ 0.688191, -0.587785, -0.425325 },
|
||||
{ 0.587785, -0.425325, -0.688191 },
|
||||
{ 0.000000, -0.955423, -0.295242 },
|
||||
{ 0.000000, -1.000000, 0.000000 },
|
||||
{ 0.262866, -0.951056, -0.162460 },
|
||||
{ 0.000000, -0.850651, 0.525731 },
|
||||
{ 0.000000, -0.955423, 0.295242 },
|
||||
{ 0.238856, -0.864188, 0.442863 },
|
||||
{ 0.262866, -0.951056, 0.162460 },
|
||||
{ 0.500000, -0.809017, 0.309017 },
|
||||
{ 0.716567, -0.681718, 0.147621 },
|
||||
{ 0.525731, -0.850651, 0.000000 },
|
||||
{ -0.238856, -0.864188, -0.442863 },
|
||||
{ -0.500000, -0.809017, -0.309017 },
|
||||
{ -0.262866, -0.951056, -0.162460 },
|
||||
{ -0.850651, -0.525731, 0.000000 },
|
||||
{ -0.716567, -0.681718, -0.147621 },
|
||||
{ -0.716567, -0.681718, 0.147621 },
|
||||
{ -0.525731, -0.850651, 0.000000 },
|
||||
{ -0.500000, -0.809017, 0.309017 },
|
||||
{ -0.238856, -0.864188, 0.442863 },
|
||||
{ -0.262866, -0.951056, 0.162460 },
|
||||
{ -0.864188, -0.442863, 0.238856 },
|
||||
{ -0.809017, -0.309017, 0.500000 },
|
||||
{ -0.688191, -0.587785, 0.425325 },
|
||||
{ -0.681718, -0.147621, 0.716567 },
|
||||
{ -0.442863, -0.238856, 0.864188 },
|
||||
{ -0.587785, -0.425325, 0.688191 },
|
||||
{ -0.309017, -0.500000, 0.809017 },
|
||||
{ -0.147621, -0.716567, 0.681718 },
|
||||
{ -0.425325, -0.688191, 0.587785 },
|
||||
{ -0.162460, -0.262866, 0.951056 },
|
||||
{ 0.442863, -0.238856, 0.864188 },
|
||||
{ 0.162460, -0.262866, 0.951056 },
|
||||
{ 0.309017, -0.500000, 0.809017 },
|
||||
{ 0.147621, -0.716567, 0.681718 },
|
||||
{ 0.000000, -0.525731, 0.850651 },
|
||||
{ 0.425325, -0.688191, 0.587785 },
|
||||
{ 0.587785, -0.425325, 0.688191 },
|
||||
{ 0.688191, -0.587785, 0.425325 },
|
||||
{ -0.955423, 0.295242, 0.000000 },
|
||||
{ -0.951056, 0.162460, 0.262866 },
|
||||
{ -1.000000, 0.000000, 0.000000 },
|
||||
{ -0.850651, 0.000000, 0.525731 },
|
||||
{ -0.955423, -0.295242, 0.000000 },
|
||||
{ -0.951056, -0.162460, 0.262866 },
|
||||
{ -0.864188, 0.442863, -0.238856 },
|
||||
{ -0.951056, 0.162460, -0.262866 },
|
||||
{ -0.809017, 0.309017, -0.500000 },
|
||||
{ -0.864188, -0.442863, -0.238856 },
|
||||
{ -0.951056, -0.162460, -0.262866 },
|
||||
{ -0.809017, -0.309017, -0.500000 },
|
||||
{ -0.681718, 0.147621, -0.716567 },
|
||||
{ -0.681718, -0.147621, -0.716567 },
|
||||
{ -0.850651, 0.000000, -0.525731 },
|
||||
{ -0.688191, 0.587785, -0.425325 },
|
||||
{ -0.587785, 0.425325, -0.688191 },
|
||||
{ -0.425325, 0.688191, -0.587785 },
|
||||
{ -0.425325, -0.688191, -0.587785 },
|
||||
{ -0.587785, -0.425325, -0.688191 },
|
||||
{ -0.688191, -0.587785, -0.425325 },
|
||||
|
|
@ -26,10 +26,6 @@
|
|||
|
||||
#include "../ref_shared.h"
|
||||
|
||||
static const float r_avertexnormals[NUMVERTEXNORMALS][3] = {
|
||||
#include "../constants/anorms.h"
|
||||
};
|
||||
|
||||
static vec4_t *lerpbuff = NULL;
|
||||
static int lerpbuffnum = 0;
|
||||
|
||||
|
|
@ -76,21 +72,6 @@ R_VertBufferFree(void)
|
|||
lerpbuffnum = 0;
|
||||
}
|
||||
|
||||
/* compressed vertex normals used by mdl and md2 model formats */
|
||||
void
|
||||
R_ConvertNormalMDL(byte in_normal, signed char *normal)
|
||||
{
|
||||
const float *norm;
|
||||
int n;
|
||||
|
||||
norm = r_avertexnormals[in_normal % NUMVERTEXNORMALS];
|
||||
|
||||
for (n = 0; n < 3; n ++)
|
||||
{
|
||||
normal[n] = norm[n] * 127.f;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
R_LerpVerts(qboolean powerUpEffect, int nverts,
|
||||
const dxtrivertx_t *v, const dxtrivertx_t *ov,
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
|
|
@ -1,52 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 1997-2001 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.
|
||||
*
|
||||
* =======================================================================
|
||||
*
|
||||
* The shared model structures file format
|
||||
*
|
||||
* =======================================================================
|
||||
*/
|
||||
|
||||
#ifndef SRC_CLIENT_REFRESH_FILES_MODELS_H_
|
||||
#define SRC_CLIENT_REFRESH_FILES_MODELS_H_
|
||||
|
||||
#include "../ref_shared.h"
|
||||
|
||||
/* Unpacked vertex info model convert */
|
||||
typedef struct dmdx_vert_s
|
||||
{
|
||||
vec3_t xyz;
|
||||
vec3_t norm;
|
||||
} dmdx_vert_t;
|
||||
|
||||
extern void PrepareFrameVertex(dmdx_vert_t *vertexArray, int num_verts,
|
||||
daliasxframe_t *frame_out);
|
||||
extern void *Mod_LoadModel_MD5(const char *mod_name, const void *buffer,
|
||||
int modfilelen, modtype_t *type);
|
||||
extern void *Mod_LoadModel_MDR(const char *mod_name, const void *buffer,
|
||||
int modfilelen, modtype_t *type);
|
||||
extern int Mod_LoadCmdCompress(const dstvert_t *texcoords, dtriangle_t *triangles,
|
||||
int num_tris, int *commands, int skinwidth, int skinheight);
|
||||
extern void Mod_LoadCmdGenerate(dmdx_t *pheader);
|
||||
extern void Mod_LoadFixImages(const char* mod_name, dmdx_t *pheader, qboolean internal);
|
||||
extern void Mod_LoadAnimGroupList(dmdx_t *pheader);
|
||||
extern dmdx_t *Mod_LoadAllocate(const char *mod_name, dmdx_t *dmdxheader, void **extradata);
|
||||
|
||||
#endif /* SRC_CLIENT_REFRESH_FILES_MODELS_H_ */
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,405 +0,0 @@
|
|||
/*
|
||||
* Copyright (C) 1997-2005 Id Software, Inc.
|
||||
* Copyright (C) 2010 Matthew Baranowski, Sander van Rossen & Raven software.
|
||||
*
|
||||
* 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.
|
||||
*
|
||||
* =======================================================================
|
||||
*
|
||||
* The MDR models file format
|
||||
*
|
||||
* =======================================================================
|
||||
*/
|
||||
|
||||
#include "models.h"
|
||||
|
||||
#define MC_BITS_X (16)
|
||||
#define MC_BITS_Y (16)
|
||||
#define MC_BITS_Z (16)
|
||||
#define MC_BITS_VECT (16)
|
||||
|
||||
#define MC_SCALE_X (1.0f/64)
|
||||
#define MC_SCALE_Y (1.0f/64)
|
||||
#define MC_SCALE_Z (1.0f/64)
|
||||
|
||||
#define MC_MASK_X ((1<<(MC_BITS_X))-1)
|
||||
#define MC_MASK_Y ((1<<(MC_BITS_Y))-1)
|
||||
#define MC_MASK_Z ((1<<(MC_BITS_Z))-1)
|
||||
#define MC_MASK_VECT ((1<<(MC_BITS_VECT))-1)
|
||||
|
||||
#define MC_SCALE_VECT (1.0f/(float)((1<<(MC_BITS_VECT-1))-2))
|
||||
|
||||
#define MC_POS_X (0)
|
||||
#define MC_SHIFT_X (0)
|
||||
|
||||
#define MC_POS_Y ((((MC_BITS_X))/8))
|
||||
#define MC_SHIFT_Y ((((MC_BITS_X)%8)))
|
||||
|
||||
#define MC_POS_Z ((((MC_BITS_X+MC_BITS_Y))/8))
|
||||
#define MC_SHIFT_Z ((((MC_BITS_X+MC_BITS_Y)%8)))
|
||||
|
||||
#define MC_POS_V11 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z))/8))
|
||||
#define MC_SHIFT_V11 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z)%8)))
|
||||
|
||||
#define MC_POS_V12 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT))/8))
|
||||
#define MC_SHIFT_V12 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT)%8)))
|
||||
|
||||
#define MC_POS_V13 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*2))/8))
|
||||
#define MC_SHIFT_V13 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*2)%8)))
|
||||
|
||||
#define MC_POS_V21 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*3))/8))
|
||||
#define MC_SHIFT_V21 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*3)%8)))
|
||||
|
||||
#define MC_POS_V22 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*4))/8))
|
||||
#define MC_SHIFT_V22 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*4)%8)))
|
||||
|
||||
#define MC_POS_V23 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*5))/8))
|
||||
#define MC_SHIFT_V23 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*5)%8)))
|
||||
|
||||
#define MC_POS_V31 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*6))/8))
|
||||
#define MC_SHIFT_V31 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*6)%8)))
|
||||
|
||||
#define MC_POS_V32 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*7))/8))
|
||||
#define MC_SHIFT_V32 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*7)%8)))
|
||||
|
||||
#define MC_POS_V33 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*8))/8))
|
||||
#define MC_SHIFT_V33 ((((MC_BITS_X+MC_BITS_Y+MC_BITS_Z+MC_BITS_VECT*8)%8)))
|
||||
|
||||
static void
|
||||
MC_UnCompress(float mat[3][4],const unsigned char * comp)
|
||||
{
|
||||
int val;
|
||||
|
||||
val=(int)((unsigned short *)(comp))[0];
|
||||
val-=1<<(MC_BITS_X-1);
|
||||
mat[0][3]=((float)(val))*MC_SCALE_X;
|
||||
|
||||
val=(int)((unsigned short *)(comp))[1];
|
||||
val-=1<<(MC_BITS_Y-1);
|
||||
mat[1][3]=((float)(val))*MC_SCALE_Y;
|
||||
|
||||
val=(int)((unsigned short *)(comp))[2];
|
||||
val-=1<<(MC_BITS_Z-1);
|
||||
mat[2][3]=((float)(val))*MC_SCALE_Z;
|
||||
|
||||
val=(int)((unsigned short *)(comp))[3];
|
||||
val-=1<<(MC_BITS_VECT-1);
|
||||
mat[0][0]=((float)(val))*MC_SCALE_VECT;
|
||||
|
||||
val=(int)((unsigned short *)(comp))[4];
|
||||
val-=1<<(MC_BITS_VECT-1);
|
||||
mat[0][1]=((float)(val))*MC_SCALE_VECT;
|
||||
|
||||
val=(int)((unsigned short *)(comp))[5];
|
||||
val-=1<<(MC_BITS_VECT-1);
|
||||
mat[0][2]=((float)(val))*MC_SCALE_VECT;
|
||||
|
||||
|
||||
val=(int)((unsigned short *)(comp))[6];
|
||||
val-=1<<(MC_BITS_VECT-1);
|
||||
mat[1][0]=((float)(val))*MC_SCALE_VECT;
|
||||
|
||||
val=(int)((unsigned short *)(comp))[7];
|
||||
val-=1<<(MC_BITS_VECT-1);
|
||||
mat[1][1]=((float)(val))*MC_SCALE_VECT;
|
||||
|
||||
val=(int)((unsigned short *)(comp))[8];
|
||||
val-=1<<(MC_BITS_VECT-1);
|
||||
mat[1][2]=((float)(val))*MC_SCALE_VECT;
|
||||
|
||||
|
||||
val=(int)((unsigned short *)(comp))[9];
|
||||
val-=1<<(MC_BITS_VECT-1);
|
||||
mat[2][0]=((float)(val))*MC_SCALE_VECT;
|
||||
|
||||
val=(int)((unsigned short *)(comp))[10];
|
||||
val-=1<<(MC_BITS_VECT-1);
|
||||
mat[2][1]=((float)(val))*MC_SCALE_VECT;
|
||||
|
||||
val=(int)((unsigned short *)(comp))[11];
|
||||
val-=1<<(MC_BITS_VECT-1);
|
||||
mat[2][2]=((float)(val))*MC_SCALE_VECT;
|
||||
}
|
||||
|
||||
/*
|
||||
=================
|
||||
Mod_LoadModel_MDR
|
||||
|
||||
=================
|
||||
*/
|
||||
void *
|
||||
Mod_LoadModel_MDR(const char *mod_name, const void *buffer, int modfilelen,
|
||||
modtype_t *type)
|
||||
{
|
||||
int framesize, num_xyz = 0, num_tris = 0, num_glcmds = 0, num_skins = 0, meshofs = 0;
|
||||
dmdx_t dmdxheader, *pheader;
|
||||
mdr_header_t pinmodel;
|
||||
dmdxmesh_t *mesh_nodes;
|
||||
dtriangle_t *tris;
|
||||
dstvert_t *st;
|
||||
void *extradata = NULL;
|
||||
dmdx_vert_t *vertx;
|
||||
char *skin;
|
||||
int i;
|
||||
|
||||
if (modfilelen < sizeof(pinmodel))
|
||||
{
|
||||
R_Printf(PRINT_ALL, "%s: %s has incorrect header size (%i should be " YQ2_COM_PRIdS ")\n",
|
||||
__func__, mod_name, modfilelen, sizeof(pinmodel));
|
||||
return NULL;
|
||||
}
|
||||
|
||||
for (i = 0; i < sizeof(pinmodel) / sizeof(int); i++)
|
||||
{
|
||||
((int *)&pinmodel)[i] = LittleLong(((int *)buffer)[i]);
|
||||
}
|
||||
|
||||
if (pinmodel.version != MDR_VERSION)
|
||||
{
|
||||
R_Printf(PRINT_ALL, "%s: %s has wrong version number (%i should be %i)\n",
|
||||
__func__, mod_name, pinmodel.version, MDR_VERSION);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int unframesize = sizeof(mdr_frame_t) + sizeof(mdr_bone_t) * (pinmodel.num_bones - 1);
|
||||
char *frames = malloc(unframesize * pinmodel.num_frames);
|
||||
|
||||
if (pinmodel.ofs_frames < 0)
|
||||
{
|
||||
int compframesize = sizeof(mdr_compframe_t) + sizeof(mdr_compbone_t) * (pinmodel.num_bones - 1);
|
||||
for (i = 0; i < pinmodel.num_frames; i++)
|
||||
{
|
||||
mdr_compframe_t * inframe = (mdr_compframe_t*)(
|
||||
(byte*)buffer + -pinmodel.ofs_frames +
|
||||
(i * compframesize));
|
||||
mdr_frame_t *outframe = (mdr_frame_t *)(frames + i * unframesize);
|
||||
int j;
|
||||
|
||||
memset(outframe->name, 0, sizeof(outframe->name));
|
||||
for (j = 0; j < 3; j++)
|
||||
{
|
||||
outframe->bounds[0][j] = LittleFloat(inframe->bounds[0][j]);
|
||||
outframe->bounds[1][j] = LittleFloat(inframe->bounds[1][j]);
|
||||
outframe->origin[j] = LittleFloat(inframe->origin[j]);
|
||||
outframe->radius = LittleFloat(inframe->radius);
|
||||
}
|
||||
for (j = 0; j < pinmodel.num_bones; j ++)
|
||||
{
|
||||
MC_UnCompress(outframe->bones[j].matrix, inframe->bones[j].Comp);
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
for (i = 0; i < pinmodel.num_frames; i++)
|
||||
{
|
||||
mdr_frame_t * inframe = (mdr_frame_t*)(
|
||||
(byte*)buffer + pinmodel.ofs_frames +
|
||||
(i * unframesize));
|
||||
mdr_frame_t *outframe = (mdr_frame_t *)(frames + i * unframesize);
|
||||
int j;
|
||||
|
||||
memcpy(outframe->name, inframe->name, sizeof(outframe->name));
|
||||
for (j = 0; j < 3; j++)
|
||||
{
|
||||
outframe->bounds[0][j] = LittleFloat(inframe->bounds[0][j]);
|
||||
outframe->bounds[1][j] = LittleFloat(inframe->bounds[1][j]);
|
||||
outframe->origin[j] = LittleFloat(inframe->origin[j]);
|
||||
outframe->radius = LittleFloat(inframe->radius);
|
||||
}
|
||||
|
||||
int float_count = pinmodel.num_bones * sizeof(mdr_bone_t);
|
||||
float *infloat, *outfloat;
|
||||
infloat = (float *)&inframe->bones;
|
||||
outfloat = (float *)&outframe->bones;
|
||||
for (j = 0; j < float_count; j ++)
|
||||
{
|
||||
outfloat[j] = LittleFloat(infloat[j]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
mdr_lod_t *inlod;
|
||||
inlod = (mdr_lod_t*)((byte *)buffer + pinmodel.ofs_lods);
|
||||
|
||||
meshofs = inlod->ofs_surfaces;
|
||||
for (i = 0; i < inlod->num_surfaces; i++)
|
||||
{
|
||||
mdr_surface_t* insurf;
|
||||
|
||||
insurf = (mdr_surface_t*)((char*)inlod + meshofs);
|
||||
num_tris += LittleLong(insurf->num_tris);
|
||||
num_xyz += LittleLong(insurf->num_verts);
|
||||
meshofs += LittleLong(insurf->ofs_end);
|
||||
}
|
||||
|
||||
num_skins = inlod->num_surfaces;
|
||||
|
||||
/* (count vert + 3 vert * (2 float + 1 int)) + final zero; */
|
||||
num_glcmds = (10 * num_tris) + 1 * inlod->num_surfaces;
|
||||
|
||||
framesize = sizeof(daliasxframe_t) + sizeof(dxtrivertx_t) * num_xyz;
|
||||
|
||||
/* copy back all values */
|
||||
memset(&dmdxheader, 0, sizeof(dmdxheader));
|
||||
dmdxheader.framesize = framesize;
|
||||
dmdxheader.skinheight = 256;
|
||||
dmdxheader.skinwidth = 256;
|
||||
dmdxheader.num_skins = num_skins;
|
||||
dmdxheader.num_glcmds = num_glcmds;
|
||||
dmdxheader.num_frames = pinmodel.num_frames;
|
||||
dmdxheader.num_xyz = num_xyz;
|
||||
dmdxheader.num_meshes = inlod->num_surfaces;
|
||||
dmdxheader.num_st = num_xyz;
|
||||
dmdxheader.num_tris = num_tris;
|
||||
dmdxheader.num_animgroup = pinmodel.num_frames;
|
||||
|
||||
pheader = Mod_LoadAllocate(mod_name, &dmdxheader, &extradata);
|
||||
|
||||
mesh_nodes = (dmdxmesh_t *)((byte *)pheader + pheader->ofs_meshes);
|
||||
tris = (dtriangle_t*)((byte *)pheader + pheader->ofs_tris);
|
||||
st = (dstvert_t*)((byte *)pheader + pheader->ofs_st);
|
||||
vertx = malloc(pinmodel.num_frames * pheader->num_xyz * sizeof(dmdx_vert_t));
|
||||
skin = (char *)pheader + pheader->ofs_skins;
|
||||
|
||||
num_xyz = 0;
|
||||
num_tris = 0;
|
||||
meshofs = inlod->ofs_surfaces;
|
||||
|
||||
for (i = 0; i < inlod->num_surfaces; i++)
|
||||
{
|
||||
mdr_surface_t* insurf;
|
||||
const int *p;
|
||||
int j;
|
||||
|
||||
insurf = (mdr_surface_t*)((char*)inlod + meshofs);
|
||||
|
||||
/* load shaders */
|
||||
memcpy(skin, insurf->shader, Q_min(sizeof(insurf->shader), MAX_SKINNAME));
|
||||
skin += MAX_SKINNAME;
|
||||
|
||||
/* load triangles */
|
||||
p = (const int*)((byte*)insurf + LittleLong(insurf->ofs_tris));
|
||||
|
||||
mesh_nodes[i].ofs_tris = num_tris;
|
||||
mesh_nodes[i].num_tris = LittleLong(insurf->num_tris);
|
||||
|
||||
for (j = 0; j < mesh_nodes[i].num_tris; j++)
|
||||
{
|
||||
int k;
|
||||
|
||||
for (k = 0; k < 3; k++)
|
||||
{
|
||||
int vert_id;
|
||||
|
||||
/* index */
|
||||
vert_id = LittleLong(p[j * 3 + k]) + num_xyz;
|
||||
tris[num_tris + j].index_xyz[k] = vert_id;
|
||||
tris[num_tris + j].index_st[k] = vert_id;
|
||||
}
|
||||
}
|
||||
|
||||
/* load vertex */
|
||||
mdr_vertex_t * inVert = (mdr_vertex_t *)((char*)insurf + insurf->ofs_verts);
|
||||
for (j = 0; j < insurf->num_verts; j ++)
|
||||
{
|
||||
int f;
|
||||
|
||||
st[j + num_xyz].s = LittleFloat(inVert->texcoords[0]) * pheader->skinwidth;
|
||||
st[j + num_xyz].t = LittleFloat(inVert->texcoords[1]) * pheader->skinheight;
|
||||
|
||||
for (f = 0; f < pinmodel.num_frames; f ++)
|
||||
{
|
||||
int k, vert_pos;
|
||||
mdr_frame_t *outframe = (mdr_frame_t *)(frames + f * unframesize);
|
||||
vec3_t tempVert, tempNormal;
|
||||
mdr_weight_t *w;
|
||||
|
||||
vert_pos = num_xyz + f * pheader->num_xyz + j;
|
||||
|
||||
VectorClear(tempVert);
|
||||
VectorClear(tempNormal);
|
||||
|
||||
w = inVert->weights;
|
||||
for ( k = 0; k < LittleLong(inVert->num_weights); k++, w++)
|
||||
{
|
||||
mdr_bone_t *bone;
|
||||
float bone_weight;
|
||||
vec3_t innorm, inoffset;
|
||||
int n;
|
||||
|
||||
bone = outframe->bones + LittleLong(w->bone_index);
|
||||
|
||||
VectorCopy(w->offset, inoffset);
|
||||
VectorCopy(inVert->normal, innorm);
|
||||
for (n = 0; n < 3; n++)
|
||||
{
|
||||
inoffset[n] = LittleFloat(inoffset[n]);
|
||||
innorm[n] = LittleFloat(innorm[n]);
|
||||
}
|
||||
bone_weight = LittleFloat(w->bone_weight);
|
||||
|
||||
for (n = 0; n < 3; n++)
|
||||
{
|
||||
tempVert[n] += bone_weight * (DotProduct(bone->matrix[n], inoffset) + bone->matrix[n][3]);
|
||||
tempNormal[n] += bone_weight * DotProduct(bone->matrix[n], innorm);
|
||||
}
|
||||
}
|
||||
|
||||
VectorCopy(tempVert, vertx[vert_pos].xyz);
|
||||
VectorCopy(tempNormal, vertx[vert_pos].norm);
|
||||
}
|
||||
inVert = (mdr_vertex_t *)((char *)inVert +
|
||||
sizeof(mdr_vertex_t) + sizeof(mdr_weight_t) * (inVert->num_weights - 1));
|
||||
}
|
||||
|
||||
num_tris += LittleLong(insurf->num_tris);
|
||||
num_xyz += LittleLong(insurf->num_verts);
|
||||
meshofs += LittleLong(insurf->ofs_end);
|
||||
}
|
||||
|
||||
for (i = 0; i < pheader->num_frames; i ++)
|
||||
{
|
||||
daliasxframe_t *frame = (daliasxframe_t *)(
|
||||
(byte *)pheader + pheader->ofs_frames + i * pheader->framesize);
|
||||
const mdr_frame_t *outframe = (mdr_frame_t *)(frames + i * unframesize);
|
||||
|
||||
if (outframe->name[0])
|
||||
{
|
||||
strncpy(frame->name, outframe->name, sizeof(frame->name) - 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
snprintf(frame->name, sizeof(frame->name), "frame%d", i);
|
||||
}
|
||||
|
||||
PrepareFrameVertex(vertx + i * pheader->num_xyz,
|
||||
pheader->num_xyz, frame);
|
||||
}
|
||||
|
||||
free(vertx);
|
||||
free(frames);
|
||||
|
||||
Mod_LoadAnimGroupList(pheader);
|
||||
Mod_LoadCmdGenerate(pheader);
|
||||
|
||||
Mod_LoadFixImages(mod_name, pheader, false);
|
||||
|
||||
*type = mod_alias;
|
||||
|
||||
return extradata;
|
||||
}
|
||||
|
|
@ -433,17 +433,12 @@ Mod_AliasesFreeAll(void)
|
|||
model_num = 0;
|
||||
}
|
||||
|
||||
static void
|
||||
Mod_AliasSave(const char *namewe, int filesize, const void *buffer)
|
||||
static const model_t *
|
||||
Mod_AliasSave(const char *namewe, int modfilelen, const void *buffer)
|
||||
{
|
||||
model_t *mod;
|
||||
int i;
|
||||
|
||||
if (filesize <= 0)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
mod = NULL;
|
||||
for (i = 0; i < MAX_MOD_KNOWN; i++)
|
||||
{
|
||||
|
|
@ -464,12 +459,18 @@ Mod_AliasSave(const char *namewe, int filesize, const void *buffer)
|
|||
Mod_AliasFree(mod);
|
||||
}
|
||||
|
||||
mod->extradata = Hunk_Begin(filesize);
|
||||
/* copy to new allocated memory */
|
||||
memcpy(Hunk_Alloc(filesize), buffer, filesize);
|
||||
mod->extradata = Mod_LoadModelFile(namewe, buffer, modfilelen);
|
||||
if (!mod->extradata)
|
||||
{
|
||||
/* unrecognized format */
|
||||
return NULL;
|
||||
}
|
||||
|
||||
mod->extradatasize = Hunk_End();
|
||||
|
||||
strncpy(mod->name, namewe, sizeof(mod->name) - 1);
|
||||
|
||||
return mod;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
@ -481,6 +482,7 @@ int
|
|||
Mod_LoadFile(const char *name, void **buffer)
|
||||
{
|
||||
size_t tlen, len, i;
|
||||
const model_t *mod;
|
||||
char namewe[256];
|
||||
const char* ext;
|
||||
int filesize;
|
||||
|
|
@ -519,35 +521,49 @@ Mod_LoadFile(const char *name, void **buffer)
|
|||
}
|
||||
|
||||
filesize = Mod_LoadFileWithoutExt(namewe, buffer, ext);
|
||||
if (filesize > 0)
|
||||
if (filesize <= 0)
|
||||
{
|
||||
/* Replacement of ReRelease models */
|
||||
if (!strcmp(namewe, "models/monsters/soldierh/tris"))
|
||||
{
|
||||
filesize = Mod_LoadFileWithoutExt("models/monsters/soldier/tris",
|
||||
buffer, ext);
|
||||
}
|
||||
else if (!strcmp(namewe, "models/monsters/gladb/tris"))
|
||||
{
|
||||
filesize = Mod_LoadFileWithoutExt("models/monsters/gladiatr/tris",
|
||||
buffer, ext);
|
||||
}
|
||||
else if (!strcmp(namewe, "models/monsters/boss5/tris"))
|
||||
{
|
||||
filesize = Mod_LoadFileWithoutExt("models/monsters/boss1/tris",
|
||||
buffer, ext);
|
||||
}
|
||||
else if (!strcmp(namewe, "models/monsters/bitch2/tris"))
|
||||
{
|
||||
filesize = Mod_LoadFileWithoutExt("models/monsters/bitch/tris",
|
||||
buffer, ext);
|
||||
}
|
||||
}
|
||||
|
||||
if (filesize <= 0)
|
||||
{
|
||||
Mod_AliasSave(namewe, filesize, *buffer);
|
||||
return filesize;
|
||||
}
|
||||
|
||||
/* Replacement of ReRelease models */
|
||||
if (!strcmp(namewe, "models/monsters/soldierh/tris"))
|
||||
/* save and convert */
|
||||
mod = Mod_AliasSave(namewe, filesize, *buffer);
|
||||
if (mod)
|
||||
{
|
||||
filesize = Mod_LoadFileWithoutExt("models/monsters/soldier/tris",
|
||||
buffer, ext);
|
||||
}
|
||||
else if (!strcmp(namewe, "models/monsters/gladb/tris"))
|
||||
{
|
||||
filesize = Mod_LoadFileWithoutExt("models/monsters/gladiatr/tris",
|
||||
buffer, ext);
|
||||
}
|
||||
else if (!strcmp(namewe, "models/monsters/boss5/tris"))
|
||||
{
|
||||
filesize = Mod_LoadFileWithoutExt("models/monsters/boss1/tris",
|
||||
buffer, ext);
|
||||
}
|
||||
else if (!strcmp(namewe, "models/monsters/bitch2/tris"))
|
||||
{
|
||||
filesize = Mod_LoadFileWithoutExt("models/monsters/bitch/tris",
|
||||
buffer, ext);
|
||||
}
|
||||
/* free old buffer */
|
||||
FS_FreeFile(*buffer);
|
||||
|
||||
Mod_AliasSave(namewe, filesize, *buffer);
|
||||
/* copy buffer */
|
||||
*buffer = Z_Malloc(mod->extradatasize);
|
||||
memcpy(*buffer, mod->extradata, mod->extradatasize);
|
||||
|
||||
return mod->extradatasize;
|
||||
}
|
||||
|
||||
return filesize;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue