X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=model_alias.h;h=8f153e555fb818866d3c4f18d3823acdd97ea737;hp=4e6faa02d573cb1ea29a8b7421da413beeed1ffe;hb=e3c655432c0a5054156e457f53cdae1efc9600b9;hpb=1ffce651075275f57c7e04b443ea6f1fd748fd98 diff --git a/model_alias.h b/model_alias.h index 4e6faa02..8f153e55 100644 --- a/model_alias.h +++ b/model_alias.h @@ -21,6 +21,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef MODEL_ALIAS_H #define MODEL_ALIAS_H +#include +#include "qtypes.h" /* ============================================================================== @@ -32,7 +34,8 @@ Alias models are position independent, so the cache manager can move them. #include "modelgen.h" -typedef struct { +typedef struct daliashdr_s +{ int ident; int version; vec3_t scale; @@ -45,10 +48,11 @@ typedef struct { int numverts; int numtris; int numframes; - synctype_t synctype; + int synctype; int flags; float size; -} daliashdr_t; +} +daliashdr_t; /* ======================================================================== @@ -58,25 +62,25 @@ typedef struct { ======================================================================== */ -// LordHavoc: grabbed this from the Q2 utility source, +// LadyHavoc: grabbed this from the Q2 utility source, // renamed a things to avoid conflicts #define MD2ALIAS_VERSION 8 #define MD2_SKINNAME 64 -typedef struct +typedef struct md2stvert_s { short s; short t; } md2stvert_t; -typedef struct +typedef struct md2triangle_s { short index_xyz[3]; short index_st[3]; } md2triangle_t; -typedef struct +typedef struct md2frame_s { float scale[3]; // multiply byte verts by this float translate[3]; // then add this @@ -92,7 +96,7 @@ typedef struct // and an integer vertex index. -typedef struct +typedef struct md2_s { int ident; int version; @@ -116,17 +120,9 @@ typedef struct int ofs_end; // end of file } md2_t; -extern void Mod_IDP0_Load(struct model_s *mod, void *buffer); -extern void Mod_IDP2_Load(struct model_s *mod, void *buffer); -extern void Mod_IDP3_Load(struct model_s *mod, void *buffer); - -extern void Mod_AliasInit(void); - -#include "model_zymotic.h" - // all md3 ints, floats, and shorts, are little endian, and thus need to be // passed through LittleLong/LittleFloat/LittleShort to avoid breaking on -// bigendian machines (Macs for example) +// bigendian machines #define MD3VERSION 15 #define MD3NAME 64 #define MD3FRAMENAME 16 @@ -135,7 +131,9 @@ extern void Mod_AliasInit(void); // the pitch and yaw are encoded as 8 bits each typedef struct md3vertex_s { - short origin[3], normalpitchyaw; + short origin[3]; + unsigned char pitch; + unsigned char yaw; } md3vertex_t; @@ -213,87 +211,10 @@ typedef struct md3modelheader_s } md3modelheader_t; -// this layer is fog (completely specialized behavior, automatic NODRAW_IF_NOTFOGGED behavior) -#define ALIASLAYER_FOG 1 -// apply diffuse lighting -#define ALIASLAYER_DIFFUSE 8 -// apply specular lighting -#define ALIASLAYER_SPECULAR 16 -// tint with pants color -#define ALIASLAYER_COLORMAP_PANTS 32 -// tint with shirt color -#define ALIASLAYER_COLORMAP_SHIRT 64 -// don't draw this layer if colormap is not used -#define ALIASLAYER_NODRAW_IF_NOTCOLORMAPPED 128 -// don't draw this layer if colormap is used -#define ALIASLAYER_NODRAW_IF_COLORMAPPED 256 -// ignore NODRAW flags on this layer only if all previous layers were skipped -#define ALIASLAYER_FORCEDRAW_IF_FIRSTPASS 512 - -typedef struct aliaslayer_s -{ - int flags; - rtexture_t *texture; - rtexture_t *nmap; -} -aliaslayer_t; - -// indicates this skin is transparent -#define ALIASSKIN_TRANSPARENT 1 - -typedef struct aliasskin_s -{ - int flags; - int num_layers; - aliaslayer_t *data_layers; -} -aliasskin_t; - -typedef struct aliasvertexboneweight_s -{ - unsigned int vertexindex; - unsigned int boneindex; - float origin[3]; - float weight; -} -aliasvertexboneweight_t; - -typedef struct aliasmesh_s -{ - // skins to choose from (indexed by entity skin) - int num_skins; - aliasskin_t *data_skins; - - // triangles comprising the mesh - int num_triangles; - int *data_element3i; - int *data_neighbor3i; - - // skin texcoords do not change - int num_vertices; - float *data_texcoord2f; - - // morph blending, these are zero if model is skeletal - int num_morphframes; - float *data_morphvertex3f; - - // base frame (frame zero typically) - // since most models do not animate, caching the base frame helps - float *data_basevertex3f; - float *data_basesvector3f; - float *data_basetvector3f; - float *data_basenormal3f; - - // skeletal blending, these are zero if model is morph - int num_vertexboneweights; - aliasvertexboneweight_t *data_vertexboneweights; -} -aliasmesh_t; - typedef struct aliastag_s { char name[MD3NAME]; - matrix4x4_t matrix; + float matrixgl[12]; } aliastag_t; @@ -305,8 +226,30 @@ typedef struct aliasbone_s } aliasbone_t; +#include "model_zymotic.h" + +#include "model_dpmodel.h" + +#include "model_psk.h" + +#include "model_iqm.h" + +// for decoding md3 model latlong vertex normals +extern float mod_md3_sin[320]; + +extern struct cvar_s r_skeletal_debugbone; +extern struct cvar_s r_skeletal_debugbonecomponent; +extern struct cvar_s r_skeletal_debugbonevalue; +extern struct cvar_s r_skeletal_debugtranslatex; +extern struct cvar_s r_skeletal_debugtranslatey; +extern struct cvar_s r_skeletal_debugtranslatez; + +struct model_s; struct frameblend_s; -void Mod_Alias_GetMesh_Vertex3f(const struct model_s *model, const struct frameblend_s *frameblend, const struct aliasmesh_s *mesh, float *out3f); +struct skeleton_s; + +void *Mod_Skeletal_AnimateVertices_AllocBuffers(size_t nbytes); +void Mod_Skeletal_BuildTransforms(const struct model_s * RESTRICT model, const struct frameblend_s * RESTRICT frameblend, const struct skeleton_s *skeleton, float * RESTRICT bonepose, float * RESTRICT boneposerelative); #endif