Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
danij-deng committed Jan 13, 2013
1 parent db3159e commit b785d5c
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 20 deletions.
36 changes: 17 additions & 19 deletions doomsday/engine/include/resource/material.h
Expand Up @@ -213,31 +213,21 @@ boolean Material_IsValid(material_t const *mat);
/// @return @c true= the material is animated.
boolean Material_IsAnimated(material_t const *mat);

#ifdef LIBDENG_OLD_MATERIAL_ANIM_METHOD
/// @return @c true= the material belongs to one or more anim groups.
boolean Material_IsGroupAnimated(material_t const *mat);
#endif

/// @return @c true if Material should be replaced with Sky.
/// Returns @c true if the material is considered @em skymasked.
boolean Material_IsSkyMasked(material_t const *mat);

/// @return @c true if Material is considered drawable.
/// Returns @c true if the material is considered drawable.
boolean Material_IsDrawable(material_t const *mat);

/// @return @c true if one or more animation stages are defined as "glowing".
boolean Material_HasGlow(material_t *mat);
/// Returns @c true if one or more (light) decorations are defined for the material.
boolean Material_HasDecorations(material_t const *mat);

/// Returns @c true if one or more of the material's layers are glowing.
boolean Material_HasGlow(material_t const *mat);

/// @return Number of layers.
int Material_LayerCount(material_t const *mat);

#ifdef LIBDENG_OLD_MATERIAL_ANIM_METHOD
/// @return @c true if there is an active translation.
boolean Material_HasTranslation(material_t const *mat);

/// Change the group animation status.
void Material_SetGroupAnimated(material_t *mat, boolean yes);
#endif

/// @return Prepared state of this material.
byte Material_Prepared(material_t const *mat);

Expand Down Expand Up @@ -342,8 +332,16 @@ struct texture_s *Material_ShinyMaskTexture(material_t *mat);
*/
void Material_SetShinyMaskTexture(material_t *mat, struct texture_s *tex);

/// Returns @c true if one or more light decorations are defined for the material.
boolean Material_HasDecorations(material_t *mat);
#ifdef LIBDENG_OLD_MATERIAL_ANIM_METHOD
/// @return @c true= the material belongs to one or more anim groups.
boolean Material_IsGroupAnimated(material_t const *mat);

/// @return @c true if there is an active translation.
boolean Material_HasTranslation(material_t const *mat);

/// Change the group animation status.
void Material_SetGroupAnimated(material_t *mat, boolean yes);
#endif

/**
* Get a property value, selected by DMU_* name.
Expand Down
2 changes: 1 addition & 1 deletion doomsday/engine/src/resource/material.cpp
Expand Up @@ -454,7 +454,7 @@ boolean Material_IsDrawable(material_t const *mat)
return 0 == (mat->flags & MATF_NO_DRAW);
}

boolean Material_HasGlow(material_t *mat)
boolean Material_HasGlow(material_t const *mat)
{
DENG_ASSERT(mat);
if(mat->def)
Expand Down

0 comments on commit b785d5c

Please sign in to comment.