Bulk of mesh. Excluded via #if MESH_ENABLED. LLModel still needs updated for strided vbos, Collada SDK needs to be wrangled, and misc pieces need to be found and brought over. Skipping inventory stuff until meshes are at least displayable.
This commit is contained in:
@@ -83,6 +83,9 @@ public:
|
||||
HUD_RENDER = 0x0008,
|
||||
USE_FACE_COLOR = 0x0010,
|
||||
TEXTURE_ANIM = 0x0020,
|
||||
#if MESH_ENABLED
|
||||
RIGGED = 0x0040,
|
||||
#endif //MESH_ENABLED
|
||||
};
|
||||
|
||||
static void initClass();
|
||||
@@ -212,6 +215,13 @@ public:
|
||||
void setVertexBuffer(LLVertexBuffer* buffer);
|
||||
void clearVertexBuffer(); //sets mVertexBuffer and mLastVertexBuffer to NULL
|
||||
LLVertexBuffer* getVertexBuffer() const { return mVertexBuffer; }
|
||||
#if MESH_ENABLED
|
||||
U32 getRiggedVertexBufferDataMask() const;
|
||||
S32 getRiggedIndex(U32 type) const;
|
||||
void setRiggedIndex(U32 type, S32 index);
|
||||
|
||||
static U32 getRiggedDataMask(U32 type);
|
||||
#endif //MESH_ENABLED
|
||||
public: //aligned members
|
||||
LLVector4a mExtents[2];
|
||||
|
||||
@@ -264,6 +274,10 @@ private:
|
||||
S32 mTEOffset;
|
||||
|
||||
S32 mReferenceIndex;
|
||||
#if MESH_ENABLED
|
||||
std::vector<S32> mRiggedIndex;
|
||||
#endif //MESH_ENABLED
|
||||
|
||||
F32 mVSize;
|
||||
F32 mPixelArea;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user