Quellcode durchsuchen

Removed deprecated SuppressNextChar() function.

Lasse Öörni vor 13 Jahren
Ursprung
Commit
c0273f35ca

+ 1 - 3
Bin/Data/Scripts/Editor/EditorUI.as

@@ -488,10 +488,8 @@ void HandleKeyDown(StringHash eventType, VariantMap& eventData)
     int key = eventData["Key"].GetInt();
     
     if (key == KEY_F1)
-    {
         console.Toggle();
-        input.SuppressNextChar();
-    }
+
     if (key == KEY_ESC)
     {
         UIElement@ front = ui.frontElement;

+ 2 - 5
Docs/ScriptAPI.dox

@@ -1442,8 +1442,8 @@ Properties:<br>
 - Vector2& projectionOffset
 - uint viewMask
 - uint viewOverrideFlags
-- Frustum frustum (readonly)
-- Matrix4 projection (readonly)
+- Frustum& frustum (readonly)
+- Matrix4& projection (readonly)
 - Frustum viewSpaceFrustum (readonly)
 - float halfViewSize (readonly)
 - Vector3 forwardVector (readonly)
@@ -2327,9 +2327,6 @@ Properties:<br>
 
 Input
 
-Methods:<br>
-- void SuppressNextChar()
-
 Properties:<br>
 - ShortStringHash type (readonly)
 - String& typeName (readonly)

+ 0 - 1
Engine/Engine/InputAPI.cpp

@@ -111,7 +111,6 @@ static Input* GetInput()
 static void RegisterInput(asIScriptEngine* engine)
 {
     RegisterObject<Input>(engine, "Input");
-    engine->RegisterObjectMethod("Input", "void SuppressNextChar()", asMETHOD(Input, SuppressNextChar), asCALL_THISCALL);
     engine->RegisterObjectMethod("Input", "void set_toggleFullscreen(bool)", asMETHOD(Input, SetToggleFullscreen), asCALL_THISCALL);
     engine->RegisterObjectMethod("Input", "bool get_toggleFullscreen() const", asMETHOD(Input, GetToggleFullscreen), asCALL_THISCALL);
     engine->RegisterObjectMethod("Input", "bool get_keyDown(int) const", asMETHOD(Input, GetKeyDown), asCALL_THISCALL);

+ 0 - 8
Engine/Input/Input.cpp

@@ -97,7 +97,6 @@ Input::Input(Context* context) :
     active_(false),
     minimized_(false),
     activated_(false),
-    suppressNextChar_(false),
     suppressNextMouseMove_(false),
     screenModeSet_(false),
     initialized_(false)
@@ -215,11 +214,6 @@ void Input::SetToggleFullscreen(bool enable)
     toggleFullscreen_ = enable;
 }
 
-void Input::SuppressNextChar()
-{
-    suppressNextChar_ = true;
-}
-
 bool Input::GetKeyDown(int key) const
 {
     return keyDown_.Contains(key);
@@ -598,7 +592,6 @@ void Input::HandleWindowMessage(StringHash eventType, VariantMap& eventData)
         break;
         
     case WM_CHAR:
-        if (!suppressNextChar_)
         {
             using namespace Char;
             
@@ -608,7 +601,6 @@ void Input::HandleWindowMessage(StringHash eventType, VariantMap& eventData)
             keyEventData[P_QUALIFIERS] = GetQualifiers();
             SendEvent(E_CHAR, keyEventData);
         }
-        suppressNextChar_ = false;
         eventData[P_HANDLED] = true;
         break;
     }

+ 0 - 4
Engine/Input/Input.h

@@ -51,8 +51,6 @@ public:
     void Update();
     /// %Set whether ALT-ENTER fullscreen toggle is enabled.
     void SetToggleFullscreen(bool enable);
-    /// Suppress the next char message.
-    void SuppressNextChar();
     
     /// Check if a key is held down.
     bool GetKeyDown(int key) const;
@@ -141,8 +139,6 @@ private:
     bool minimized_;
     /// Activated on this frame flag.
     bool activated_;
-    /// Next char message suppress flag.
-    bool suppressNextChar_;
     /// Next mouse move suppress flag.
     bool suppressNextMouseMove_;
     /// Screen mode changed flag. Needed only for GLFW input.