summaryrefslogtreecommitdiff
path: root/indra/test_apps/llplugintest/llmediaplugintest.h
diff options
context:
space:
mode:
authorCallum Prentice <callum@lindenlab.com>2010-03-04 14:32:24 -0800
committerCallum Prentice <callum@lindenlab.com>2010-03-04 14:32:24 -0800
commit34c8f6f7fa728c139a0da0deaccf6fda3d228680 (patch)
tree95153af12f9263f63a8680e6dd32ce035364d175 /indra/test_apps/llplugintest/llmediaplugintest.h
parent2ce7807c9e15f3941d9aa2db57cbb26cda42ba09 (diff)
Changes to plugin test app in preparation for work on positional per-process audio for media.
Not part of the client and nothing here is deployed - internal testing only.
Diffstat (limited to 'indra/test_apps/llplugintest/llmediaplugintest.h')
-rw-r--r--indra/test_apps/llplugintest/llmediaplugintest.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/indra/test_apps/llplugintest/llmediaplugintest.h b/indra/test_apps/llplugintest/llmediaplugintest.h
index c2b2baba95..e7c7699343 100644
--- a/indra/test_apps/llplugintest/llmediaplugintest.h
+++ b/indra/test_apps/llplugintest/llmediaplugintest.h
@@ -89,7 +89,7 @@ class LLMediaPluginTest : public LLPluginClassMediaOwner
void bindTexture(GLuint texture, GLint row_length = 0, GLint alignment = 1);
bool checkGLError(const char *name = "OpenGL");
- void drawGeometry( int panel );
+ void drawGeometry( int panel, bool selected );
void startPanelHighlight( float red, float green, float blue, float line_width );
void endPanelHighlight();
enum { DrawTypePickTexture, DrawTypeMediaTexture };
@@ -113,6 +113,9 @@ class LLMediaPluginTest : public LLPluginClassMediaOwner
void dumpPanelInfo();
void updateStatusBar();
+ GLfloat distanceToCamera( GLfloat point_x, GLfloat point_y, GLfloat point_z );
+
+
// Inherited from LLPluginClassMediaOwner
/*virtual*/ void handleMediaEvent(LLPluginClassMedia* self, LLPluginClassMediaOwner::EMediaEvent);
@@ -142,6 +145,8 @@ class LLMediaPluginTest : public LLPluginClassMediaOwner
float mViewPos[ 3 ];
float mViewRotation[ 16 ];
+ float mDistanceCameraToSelectedGeometry;
+
int mIdControlAddPanel;
int mIdControlRemPanel;
@@ -159,6 +164,8 @@ class LLMediaPluginTest : public LLPluginClassMediaOwner
int mRandomBookmarks;
int mIdDisableTimeout;
int mDisableTimeout;
+ int mIdLargePanelSpacing;
+ int mLargePanelSpacing;
int mIdControlCrashPlugin;
int mIdControlHangPlugin;
int mIdControlExitApp;