diff options
| author | Kitty Barnett <develop@catznip.com> | 2013-02-04 01:01:07 +0100 |
|---|---|---|
| committer | Kitty Barnett <develop@catznip.com> | 2013-02-04 01:01:07 +0100 |
| commit | d149aea87c3214ea9510ea43a7e23e03cdcb27e6 (patch) | |
| tree | fbda1184d646a86b63d5496fe64e9a7659788f1d /indra/newview/llspatialpartition.h | |
| parent | 0a99aadd7a9d5d5166ef4e581b935adc6fb034ea (diff) | |
| parent | 132db13fb6bb6dd802d3ee000a10e91127403547 (diff) | |
Merged with viewer-dev-materials
Diffstat (limited to 'indra/newview/llspatialpartition.h')
| -rw-r--r-- | indra/newview/llspatialpartition.h | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/indra/newview/llspatialpartition.h b/indra/newview/llspatialpartition.h index b1706d9d35..a71ca60d85 100644 --- a/indra/newview/llspatialpartition.h +++ b/indra/newview/llspatialpartition.h @@ -119,6 +119,17 @@ public: LL_ALIGN_16(LLFace* mFace); //associated face F32 mDistance; U32 mDrawMode; + + const LLMaterialID *mMaterialID; // If this is false, the following parameters are unused. + LLPointer<LLViewerTexture> mSpecularMap; + const LLMatrix4* mSpecularMapMatrix; + LLPointer<LLViewerTexture> mNormalMap; + const LLMatrix4* mNormalMapMatrix; + LLVector4 mSpecColor; // XYZ = Specular RGB, W = Specular Exponent + F32 mEnvIntensity; + F32 mAlphaMaskCutoff; + U8 mDiffuseAlphaMode; + struct CompareTexture { @@ -169,7 +180,7 @@ public: } }; - + struct CompareBump { bool operator()(const LLPointer<LLDrawInfo>& lhs, const LLPointer<LLDrawInfo>& rhs) |