diff options
| author | Richard Linden <none@none> | 2013-01-25 16:18:27 -0800 |
|---|---|---|
| committer | Richard Linden <none@none> | 2013-01-25 16:18:27 -0800 |
| commit | 1e39461e7bab716232366f8454793e4a5216fb13 (patch) | |
| tree | f7d8963894b8eb76e8f1a2ff20a01645b27ecc04 /indra/newview/llscenemonitor.h | |
| parent | 09ee16c61d372c1eb620bc3ef3dbfeb798c0a82e (diff) | |
| parent | 5ee3071e85de80cd37cc95c51dee5c497957ff9f (diff) | |
Automated merge with ssh://hg.lindenlab.com/richard/viewer-interesting-metrics
Diffstat (limited to 'indra/newview/llscenemonitor.h')
| -rw-r--r-- | indra/newview/llscenemonitor.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/indra/newview/llscenemonitor.h b/indra/newview/llscenemonitor.h index 02e3d57d46..709650e206 100644 --- a/indra/newview/llscenemonitor.h +++ b/indra/newview/llscenemonitor.h @@ -31,9 +31,11 @@ #include "llmath.h" #include "llfloater.h" #include "llcharacter.h" +#include "lltracerecording.h" class LLCharacter; class LLRenderTarget; +class LLViewerTexture; class LLSceneMonitor : public LLSingleton<LLSceneMonitor> { @@ -61,11 +63,14 @@ public: bool isEnabled()const {return mEnabled;} bool needsUpdate() const; + LLTrace::ExtendableRecording* getRecording() const {return mRecording;} + private: void freezeScene(); void unfreezeScene(); void reset(); bool preCapture(); + void generateDitheringTexture(S32 width, S32 height); private: BOOL mEnabled; @@ -85,7 +90,15 @@ private: F32 mSamplingTime; //time interval to capture frames, in seconds F32 mDiffPixelRatio; //ratio of pixels used for comparison against the original mDiff size along one dimension + LLPointer<LLViewerTexture> mDitheringTexture; + S32 mDitherMatrixWidth; + F32 mDitherScale; + F32 mDitherScaleS; + F32 mDitherScaleT; + std::vector<LLAnimPauseRequest> mAvatarPauseHandles; + + LLTrace::ExtendableRecording* mRecording; }; class LLSceneMonitorView : public LLFloater |