From a73a5ac833e95880b2aa98bf9579c9f2e05b74f7 Mon Sep 17 00:00:00 2001 From: Thomas White Date: Mon, 11 Aug 2008 12:27:03 +0100 Subject: Remove vestigial 'ATTRIB_RADIUS' attribute --- src/model.c | 3 --- src/types.h | 7 +++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/model.c b/src/model.c index 81958ec..f98d4bc 100644 --- a/src/model.c +++ b/src/model.c @@ -458,9 +458,6 @@ static int model_load(ModelContext *ctx, const char *name, RenderContext *render attribs = attribs | ATTRIB_COLSPEC; colspec = r; } - if ( sscanf(line, "radius %f", &radius) == 1 ) { - attribs = attribs | ATTRIB_RADIUS; - } if ( sscanf(line, "shiny %f", &shininess) == 1 ) { attribs = attribs | ATTRIB_SHINY; } diff --git a/src/types.h b/src/types.h index 1304650..a2cd40e 100644 --- a/src/types.h +++ b/src/types.h @@ -46,10 +46,9 @@ typedef enum { ATTRIB_NONE = 0, ATTRIB_COLOUR = 1<<0, /* Colour specified? */ ATTRIB_PULSE = 1<<1, /* Pulsating colour */ - ATTRIB_RADIUS = 1<<2, /* Radius is set */ - ATTRIB_SHINY = 1<<3, /* Primitive is shiny */ - ATTRIB_SWIRLY = 1<<4, /* Primitive is texture with swirlyness */ - ATTRIB_COLSPEC = 1<<5, /* Specular colour specified? */ + ATTRIB_SHINY = 1<<2, /* Primitive is shiny */ + ATTRIB_SWIRLY = 1<<3, /* Primitive is texture with swirlyness */ + ATTRIB_COLSPEC = 1<<4, /* Specular colour specified? */ } PrimitiveAttrib; typedef enum { -- cgit v1.2.3