aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas White <weiss@jade.(none)>2008-08-11 12:27:03 +0100
committerThomas White <weiss@jade.(none)>2008-08-11 12:27:03 +0100
commita73a5ac833e95880b2aa98bf9579c9f2e05b74f7 (patch)
treeb690d90c6ca8dd60456d60bd3f2452f594823fce
parent43b51cd18b2cbf5fc5dd3e5493264c80dc199bae (diff)
Remove vestigial 'ATTRIB_RADIUS' attribute
-rw-r--r--src/model.c3
-rw-r--r--src/types.h7
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 {