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:
@@ -34,7 +34,7 @@
|
||||
#define LL_LLVLCOMPOSITION_H
|
||||
|
||||
#include "llviewerlayer.h"
|
||||
#include "llviewerimage.h"
|
||||
#include "llviewertexture.h"
|
||||
|
||||
class LLSurface;
|
||||
|
||||
@@ -62,7 +62,7 @@ public:
|
||||
CORNER_COUNT = 4
|
||||
};
|
||||
LLUUID getDetailTextureID(S32 corner);
|
||||
LLViewerImage* getDetailTexture(S32 corner);
|
||||
LLViewerFetchedTexture* getDetailTexture(S32 corner);
|
||||
F32 getStartHeight(S32 corner);
|
||||
F32 getHeightRange(S32 corner);
|
||||
|
||||
@@ -79,7 +79,7 @@ protected:
|
||||
LLSurface *mSurfacep;
|
||||
BOOL mTexturesLoaded;
|
||||
|
||||
LLPointer<LLViewerImage> mDetailTextures[CORNER_COUNT];
|
||||
LLPointer<LLViewerFetchedTexture> mDetailTextures[CORNER_COUNT];
|
||||
LLPointer<LLImageRaw> mRawImages[CORNER_COUNT];
|
||||
|
||||
F32 mStartHeight[CORNER_COUNT];
|
||||
|
||||
Reference in New Issue
Block a user