From bf29d43729a447af9ab480c148f332a88ddec8b7 Mon Sep 17 00:00:00 2001 From: "Zephaniah E. Hull" Date: Wed, 28 Feb 2001 18:37:06 +0000 Subject: [PATCH] Tweaked a few things for the skin struct. --- include/render.h | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/include/render.h b/include/render.h index ac8658b03..e192704cc 100644 --- a/include/render.h +++ b/include/render.h @@ -50,12 +50,12 @@ typedef struct efrag_s struct efrag_s *entnext; } efrag_t; -typedef struct new_tri_s +typedef struct r_tri_s { int vert_indices[3]; } r_tri_t; -typedef struct new_model_s +typedef struct r_model_s { char *name; int num_verts; @@ -66,12 +66,23 @@ typedef struct new_model_s new_tri_t *triangles; } r_model_t; -typedef struct new_skin_s +/* + * Note, colors are as follows. + * + * num_colors == -1: skin_color is used for all vertices. + * num_colors == 0: No color is used. (Same as -1 with skin_color 1 1 1) + * num_colors == num_verts: vert_colors is used. + * + * No other values are accepted. + */ +typedef struct r_skin_s { int texnum; + int num_colors; - vec4_t *colors; - vec4_t color; // Used if num_colors == -1 + vec4_t *vert_colors; + vec4_t skin_color; + int num_texcoords; vec2_t *texcoords; int num_tri_indices;