X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=model_shared.h;h=c34890cad8af0c43ee088e057f387b2a303817a0;hb=9b73f5e152089c02f4157b4f3cddcc884e3648cd;hp=02c237fd529313ed02f7638c7c1c9451aed7c6b2;hpb=26b14b9b9f80169eca69b17aae7ca1da0c0aff7f;p=xonotic%2Fdarkplaces.git diff --git a/model_shared.h b/model_shared.h index 02c237fd..c34890ca 100644 --- a/model_shared.h +++ b/model_shared.h @@ -103,18 +103,18 @@ blendweights_t; typedef struct r_vertexgeneric_s { - // 24 bytes + // 36 bytes float vertex3f[3]; - unsigned char color4ub[4]; + float color4f[4]; float texcoord2f[2]; } r_vertexgeneric_t; typedef struct r_vertexmesh_s { - // 68 bytes + // 80 bytes float vertex3f[3]; - unsigned char color4ub[4]; + float color4f[4]; float texcoordtexture2f[2]; float texcoordlightmap2f[2]; float svector3f[3]; @@ -445,6 +445,7 @@ typedef struct q3shaderinfo_s // dp-specific additions: // shadow control + qboolean dpnortlight; qboolean dpshadow; qboolean dpnoshadow; @@ -1098,13 +1099,6 @@ qboolean Mod_LoadTextureFromQ3Shader(texture_t *texture, const char *name, qbool extern cvar_t r_mipskins; extern cvar_t r_mipnormalmaps; -typedef struct skeleton_s -{ - const dp_model_t *model; - matrix4x4_t *relativetransforms; -} -skeleton_t; - typedef struct skinfileitem_s { struct skinfileitem_s *next;