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 @@
|
||||
|
||||
#include "llvowater.h"
|
||||
#include "llpatchvertexarray.h"
|
||||
#include "llviewerimage.h"
|
||||
#include "llviewertexture.h"
|
||||
|
||||
class LLTimer;
|
||||
class LLUUID;
|
||||
@@ -133,8 +133,8 @@ public:
|
||||
void setWaterHeight(F32 height);
|
||||
F32 getWaterHeight() const;
|
||||
|
||||
LLViewerImage *getSTexture();
|
||||
LLViewerImage *getWaterTexture();
|
||||
LLViewerTexture *getSTexture();
|
||||
LLViewerTexture *getWaterTexture();
|
||||
BOOL hasZData() const { return mHasZData; }
|
||||
|
||||
void dirtyAllPatches(); // Use this to dirty all patches when changing terrain parameters
|
||||
@@ -206,8 +206,8 @@ protected:
|
||||
|
||||
|
||||
// The textures should never be directly initialized - use the setter methods!
|
||||
LLPointer<LLViewerImage> mSTexturep; // Texture for surface
|
||||
LLPointer<LLViewerImage> mWaterTexturep; // Water texture
|
||||
LLPointer<LLViewerTexture> mSTexturep; // Texture for surface
|
||||
LLPointer<LLViewerTexture> mWaterTexturep; // Water texture
|
||||
|
||||
LLPointer<LLVOWater> mWaterObjp;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user