diff options
| author | Geenz <geenz@geenzo.com> | 2013-01-25 17:54:38 -0500 |
|---|---|---|
| committer | Geenz <geenz@geenzo.com> | 2013-01-25 17:54:38 -0500 |
| commit | 5f03e197f4cfb43de93dc42b16b54beafccd376a (patch) | |
| tree | 77fe17e9c36021148c18f7f9f33aae5abcd100c0 /indra/newview/llspatialpartition.h | |
| parent | cc7ae8fbd1fc249f77ced95171e5c22e48adedb6 (diff) | |
Trying to set materials up for rendering! Yay!
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..2c4f6754ec 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; + + 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) |