[email protected] 8 years ago
parent
commit
b8ba46ebc1
2 changed files with 29 additions and 21 deletions
  1. 29 0
      oxygine/src/oxygine/oxygine-forwards.h
  2. 0 21
      oxygine/src/oxygine/oxygine-include.h

+ 29 - 0
oxygine/src/oxygine/oxygine-forwards.h

@@ -25,8 +25,37 @@ namespace pugi
 {
     class xml_node;
 }
+
+
 namespace oxygine
 {
+    enum error_policy
+    {
+        ep_show_error,//shows assert and prints error to log
+        ep_show_warning,//prints warning to log
+        ep_ignore_error//doesn't show any errors
+    };
+
+
+    void handleErrorPolicy(error_policy ep, const char* format, ...);
+
+    typedef int timeMS;
+    typedef unsigned char pointer_index;
+
+    /** returns local app time in milliseconds (1sec = 1000ms). Counting starts from zero*/
+    timeMS          getTimeMS();
+
+    void* fastAlloc(size_t size);
+    void fastFree(void* data);
+
+    namespace key
+    {
+        typedef int keycode;
+        bool isPressed(keycode);
+        bool wasPressed(keycode);
+        bool wasReleased(keycode);
+    }
+
     namespace text
     {
         class Node;

+ 0 - 21
oxygine/src/oxygine/oxygine-include.h

@@ -161,27 +161,6 @@ typedef signed long long int64;
 #define OX_HAS_CPP11
 #endif
 
-namespace oxygine
-{
-    enum error_policy
-    {
-        ep_show_error,//shows assert and prints error to log
-        ep_show_warning,//prints warning to log
-        ep_ignore_error//doesn't show any errors
-    };
-
-
-    void handleErrorPolicy(error_policy ep, const char* format, ...);
-
-    typedef int timeMS;
-    typedef unsigned char pointer_index;
-
-    /** returns local app time in milliseconds (1sec = 1000ms). Counting starts from zero*/
-    timeMS          getTimeMS();
-
-    void* fastAlloc(size_t size);
-    void fastFree(void* data);
-}
 
 #include "oxygine-forwards.h"
 #endif