Innitial commit of experimental v2 texture system port work. Compiles and runs on windows, at least. Fixing bugs as they come.
Need to test: localassetbrowser preview related floaters hgfloatertexteditor maps media textures! Currently very hacky web browser alpha masks on avatars bumpmaps Are all sky components appearing? LLViewerDynamicTexture (texture baking, browser, animated textures, anim previews, etc) Snapshot related features Customize avatar vfs floater UI textures in general Texture priority issues
This commit is contained in:
@@ -46,7 +46,7 @@ class LLVOAvatar;
|
||||
class LLTextBox;
|
||||
class LLVertexBuffer;
|
||||
|
||||
class LLPreviewSculpted : public LLDynamicTexture
|
||||
class LLPreviewSculpted : public LLViewerDynamicTexture
|
||||
{
|
||||
public:
|
||||
LLPreviewSculpted(S32 width, S32 height);
|
||||
@@ -75,7 +75,7 @@ class LLPreviewSculpted : public LLDynamicTexture
|
||||
};
|
||||
|
||||
|
||||
class LLPreviewAvatar : public LLDynamicTexture
|
||||
class LLPreviewAvatar : public LLViewerDynamicTexture
|
||||
{
|
||||
public:
|
||||
LLPreviewAvatar(S32 width, S32 height);
|
||||
@@ -129,13 +129,13 @@ protected:
|
||||
bool loadImage(LLImageRaw* src);
|
||||
|
||||
LLPointer<LLImageRaw> mRawImagep;
|
||||
LLPreviewAvatar* mAvatarPreview;
|
||||
LLPreviewSculpted* mSculptedPreview;
|
||||
LLPointer<LLPreviewAvatar> mAvatarPreview;
|
||||
LLPointer<LLPreviewSculpted> mSculptedPreview;
|
||||
S32 mLastMouseX;
|
||||
S32 mLastMouseY;
|
||||
LLRect mPreviewRect;
|
||||
LLRectf mPreviewImageRect;
|
||||
LLPointer<LLImageGL> mImagep ;
|
||||
LLPointer<LLViewerTexture> mImagep ;
|
||||
LLViewerObject* tmpvolume;
|
||||
|
||||
static S32 sUploadAmount;
|
||||
|
||||
Reference in New Issue
Block a user