aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/llwindow/llwindow.h
diff options
context:
space:
mode:
authorJacek Antonelli2008-08-15 23:44:54 -0500
committerJacek Antonelli2008-08-15 23:44:54 -0500
commitb2afb8800bb033a04bb3ecdf0363068d56648ef1 (patch)
tree3568129b5bbddb47cd39d622b4137a8fbff4abaf /linden/indra/llwindow/llwindow.h
parentSecond Life viewer sources 1.14.0.1 (diff)
downloadmeta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.zip
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.gz
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.bz2
meta-impy-b2afb8800bb033a04bb3ecdf0363068d56648ef1.tar.xz
Second Life viewer sources 1.15.0.2
Diffstat (limited to 'linden/indra/llwindow/llwindow.h')
-rw-r--r--linden/indra/llwindow/llwindow.h8
1 files changed, 7 insertions, 1 deletions
diff --git a/linden/indra/llwindow/llwindow.h b/linden/indra/llwindow/llwindow.h
index f4bb147..a52aff6 100644
--- a/linden/indra/llwindow/llwindow.h
+++ b/linden/indra/llwindow/llwindow.h
@@ -4,6 +4,7 @@
4 * 4 *
5 * Copyright (c) 2001-2007, Linden Research, Inc. 5 * Copyright (c) 2001-2007, Linden Research, Inc.
6 * 6 *
7 * Second Life Viewer Source Code
7 * The source code in this file ("Source Code") is provided by Linden Lab 8 * The source code in this file ("Source Code") is provided by Linden Lab
8 * to you under the terms of the GNU General Public License, version 2.0 9 * to you under the terms of the GNU General Public License, version 2.0
9 * ("GPL"), unless you have obtained a separate licensing agreement 10 * ("GPL"), unless you have obtained a separate licensing agreement
@@ -200,6 +201,9 @@ public:
200 virtual F32 getNativeAspectRatio() = 0; 201 virtual F32 getNativeAspectRatio() = 0;
201 virtual F32 getPixelAspectRatio() = 0; 202 virtual F32 getPixelAspectRatio() = 0;
202 virtual void setNativeAspectRatio(F32 aspect) = 0; 203 virtual void setNativeAspectRatio(F32 aspect) = 0;
204
205 F32 getJoystickAxis(U32 axis);
206 U8 getJoystickButton(U32 button);
203 207
204 void setCallbacks(LLWindowCallbacks *callbacks); 208 void setCallbacks(LLWindowCallbacks *callbacks);
205 209
@@ -238,7 +242,9 @@ protected:
238 ESwapMethod mSwapMethod; 242 ESwapMethod mSwapMethod;
239 BOOL mHideCursorPermanent; 243 BOOL mHideCursorPermanent;
240 U32 mFlags; 244 U32 mFlags;
241 245 F32 mJoyAxis[6];
246 U8 mJoyButtonState[16];
247
242 friend class LLWindowManager; 248 friend class LLWindowManager;
243}; 249};
244 250