Refactoring.
-New LLWearableType class, uses LLDictionary for typeindex<->typename<->assettype<->typelabel conversions. -LLAvatarDefines cleaned up. Uses LLDictionary for Mesh, TE, Baked lookups/conversions. -LLAgentWearables TEWearable stuff removed. Use LLAvatarDefines. -LLWearable WearableType conversions yanked. Use LLWearableType. -LLVOAvatar TEWEarable stuff removed. Use LLAvatarDefines. -EWearableType now LLWearableType::EType -LLWearable::getID() renamed to LLWearable::getAssetID() VOAvatar cleanup. -Removed redundant TEWearable functions. -Some code migrated to F32 LLVOAvatar::calcMorphAmount(). No functional change. -LLVOAvatar::removeMissingBakedTextures virtual. Implementation moved to VOAvatarSelf
This commit is contained in:
Shyotl
@@ -38,84 +38,67 @@
|
||||
#include "llpermissions.h"
|
||||
#include "llsaleinfo.h"
|
||||
#include "llassetstorage.h"
|
||||
#include "llwearabletype.h"
|
||||
|
||||
class LLViewerInventoryItem;
|
||||
|
||||
enum EWearableType // If you change this, update LLWearable::getTypeName(), getTypeLabel(), and LLVOAvatar::getTEWearableType()
|
||||
{
|
||||
WT_SHAPE = 0,
|
||||
WT_SKIN = 1,
|
||||
WT_HAIR = 2,
|
||||
WT_EYES = 3,
|
||||
WT_SHIRT = 4,
|
||||
WT_PANTS = 5,
|
||||
WT_SHOES = 6,
|
||||
WT_SOCKS = 7,
|
||||
WT_JACKET = 8,
|
||||
WT_GLOVES = 9,
|
||||
WT_UNDERSHIRT = 10,
|
||||
WT_UNDERPANTS = 11,
|
||||
WT_SKIRT = 12,
|
||||
WT_ALPHA = 13,
|
||||
WT_TATTOO = 14,
|
||||
WT_PHYSICS = 15,
|
||||
WT_COUNT = 16,
|
||||
WT_INVALID = 255,
|
||||
WT_NONE = -1,
|
||||
};
|
||||
|
||||
class LLWearable
|
||||
{
|
||||
friend class LLWearableList;
|
||||
public:
|
||||
~LLWearable();
|
||||
|
||||
const LLAssetID& getID() const { return mAssetID; }
|
||||
//--------------------------------------------------------------------
|
||||
// Constructors and destructors
|
||||
//--------------------------------------------------------------------
|
||||
private:
|
||||
// Private constructor used by LLWearableList
|
||||
LLWearable(const LLTransactionID& transactionID);
|
||||
LLWearable(const LLAssetID& assetID);
|
||||
public:
|
||||
virtual ~LLWearable();
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
// Accessors
|
||||
//--------------------------------------------------------------------
|
||||
public:
|
||||
const LLUUID& getItemID() const;
|
||||
const LLAssetID& getAssetID() const { return mAssetID; }
|
||||
const LLTransactionID& getTransactionID() const { return mTransactionID; }
|
||||
|
||||
BOOL isDirty();
|
||||
BOOL isOldVersion();
|
||||
|
||||
void writeToAvatar( BOOL set_by_user );
|
||||
void readFromAvatar();
|
||||
void removeFromAvatar( BOOL set_by_user ) { LLWearable::removeFromAvatar( mType, set_by_user ); }
|
||||
static void removeFromAvatar( EWearableType type, BOOL set_by_user );
|
||||
|
||||
BOOL exportFile(LLFILE* file);
|
||||
BOOL importFile(LLFILE* file);
|
||||
BOOL FileExportParams(FILE* file);
|
||||
BOOL FileExportTextures(FILE* file);
|
||||
|
||||
|
||||
EWearableType getType() const { return mType; }
|
||||
void setType( EWearableType type ) { mType = type; }
|
||||
LLWearableType::EType getType() const { return mType; }
|
||||
void setType( LLWearableType::EType type );
|
||||
const std::string& getName() const { return mName; }
|
||||
void setName( const std::string& name ) { mName = name; }
|
||||
const std::string& getDescription() const { return mDescription; }
|
||||
void setDescription( const std::string& desc ) { mDescription = desc; }
|
||||
const LLPermissions& getPermissions() const { return mPermissions; }
|
||||
void setPermissions( const LLPermissions& p ) { mPermissions = p; }
|
||||
const LLSaleInfo& getSaleInfo() const { return mSaleInfo; }
|
||||
|
||||
|
||||
void setName( const std::string& name ) { mName = name; }
|
||||
const std::string& getName() const { return mName; }
|
||||
void setSaleInfo( const LLSaleInfo& info ) { mSaleInfo = info; }
|
||||
const std::string& getTypeLabel() const;
|
||||
const std::string& getTypeName() const;
|
||||
LLAssetType::EType getAssetType() const;
|
||||
|
||||
void setDescription( const std::string& desc ) { mDescription = desc; }
|
||||
const std::string& getDescription() const { return mDescription; }
|
||||
BOOL isDirty() const;
|
||||
BOOL isOldVersion() const;
|
||||
|
||||
void setPermissions( const LLPermissions& p ) { mPermissions = p; }
|
||||
const LLPermissions& getPermissions() const { return mPermissions; }
|
||||
void writeToAvatar( BOOL set_by_user );
|
||||
void readFromAvatar();
|
||||
void removeFromAvatar( BOOL upload_bake ) { LLWearable::removeFromAvatar( mType, upload_bake ); }
|
||||
static void removeFromAvatar( LLWearableType::EType type, BOOL upload_bake );
|
||||
|
||||
void setSaleInfo( const LLSaleInfo& info ) { mSaleInfo = info; }
|
||||
const LLSaleInfo& getSaleInfo() const { return mSaleInfo; }
|
||||
|
||||
const std::string& getTypeLabel() const { return LLWearable::sTypeLabel[ mType ]; }
|
||||
const std::string& getTypeName() const { return LLWearable::sTypeName[ mType ]; }
|
||||
BOOL exportFile(LLFILE* file) const;
|
||||
BOOL importFile(LLFILE* file);
|
||||
|
||||
void setParamsToDefaults();
|
||||
void setTexturesToDefaults();
|
||||
|
||||
LLAssetType::EType getAssetType() const { return LLWearable::typeToAssetType( mType ); }
|
||||
|
||||
static EWearableType typeNameToType( const std::string& type_name );
|
||||
static const std::string& typeToTypeName( EWearableType type ) { return LLWearable::sTypeName[llmin(type,WT_COUNT)]; }
|
||||
static const std::string& typeToTypeLabel( EWearableType type ) { return LLWearable::sTypeLabel[llmin(type,WT_COUNT)]; }
|
||||
static LLAssetType::EType typeToAssetType( EWearableType wearable_type );
|
||||
|
||||
void saveNewAsset();
|
||||
void saveNewAsset() const;
|
||||
static void onSaveNewAssetComplete( const LLUUID& asset_uuid, void* user_data, S32 status, LLExtStat ext_status );
|
||||
|
||||
BOOL isMatchedToInventoryItem( LLViewerInventoryItem* item );
|
||||
@@ -126,10 +109,6 @@ public:
|
||||
|
||||
friend std::ostream& operator<<(std::ostream &s, const LLWearable &w);
|
||||
|
||||
private:
|
||||
// Private constructor used by LLWearableList
|
||||
LLWearable(const LLTransactionID& transactionID);
|
||||
LLWearable(const LLAssetID& assetID);
|
||||
|
||||
static S32 sCurrentDefinitionVersion; // Depends on the current state of the avatar_lad.xml.
|
||||
S32 mDefinitionVersion; // Depends on the state of the avatar_lad.xml when this asset was created.
|
||||
@@ -139,15 +118,12 @@ private:
|
||||
LLSaleInfo mSaleInfo;
|
||||
LLAssetID mAssetID;
|
||||
LLTransactionID mTransactionID;
|
||||
EWearableType mType;
|
||||
LLWearableType::EType mType;
|
||||
|
||||
typedef std::map<S32, F32> param_map_t;
|
||||
param_map_t mVisualParamMap; // maps visual param id to weight
|
||||
typedef std::map<S32, LLUUID> te_map_t;
|
||||
te_map_t mTEMap; // maps TE to Image ID
|
||||
|
||||
static const std::string sTypeName[ WT_COUNT+1 ];
|
||||
static const std::string sTypeLabel[ WT_COUNT+1 ];
|
||||
};
|
||||
|
||||
#endif // LL_LLWEARABLE_H
|
||||
|
||||
Reference in New Issue
Block a user