Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Fix enums bindings

Browse source 
Add missed bindings for enums
Move some enums to class to have correct output of api.json
This commit is contained in:
Maxim Sheronov 2017-09-12 22:09:06 +03:00
parent 69017974be
commit 0fffa45158
62 changed files with 412 additions and 210 deletions
Download patch file Download diff file Expand all files Collapse all files

16
platform/android/power_android.cpp
View file

@ -198,19 +198,19 @@ bool power_android::GetPowerInfo_Android() {
if (Android_JNI_GetPowerInfo(&plugged, &charged, &battery, &this->nsecs_left, &this->percent_left) != -1) {
if (plugged) {
if (charged) {
this->power_state = POWERSTATE_CHARGED;
this->power_state = OS::POWERSTATE_CHARGED;
} else if (battery) {
this->power_state = POWERSTATE_CHARGING;
this->power_state = OS::POWERSTATE_CHARGING;
} else {
this->power_state = POWERSTATE_NO_BATTERY;
this->power_state = OS::POWERSTATE_NO_BATTERY;
this->nsecs_left = -1;
this->percent_left = -1;
}
} else {
this->power_state = POWERSTATE_ON_BATTERY;
this->power_state = OS::POWERSTATE_ON_BATTERY;
}
} else {
this->power_state = POWERSTATE_UNKNOWN;
this->power_state = OS::POWERSTATE_UNKNOWN;
this->nsecs_left = -1;
this->percent_left = -1;
}
@ -218,12 +218,12 @@ bool power_android::GetPowerInfo_Android() {
return true;
}
PowerState power_android::get_power_state() {
OS::PowerState power_android::get_power_state() {
if (GetPowerInfo_Android()) {
return power_state;
} else {
WARN_PRINT("Power management is not implemented on this platform, defaulting to POWERSTATE_UNKNOWN");
return POWERSTATE_UNKNOWN;
return OS::POWERSTATE_UNKNOWN;
}
}
@ -246,7 +246,7 @@ int power_android::get_power_percent_left() {
}
power_android::power_android()
: nsecs_left(-1), percent_left(-1), power_state(POWERSTATE_UNKNOWN) {
: nsecs_left(-1), percent_left(-1), power_state(OS::POWERSTATE_UNKNOWN) {
}
power_android::~power_android() {

6
platform/android/power_android.h
View file

@ -31,7 +31,7 @@
#ifndef PLATFORM_ANDROID_POWER_ANDROID_H_
#define PLATFORM_ANDROID_POWER_ANDROID_H_
#include "os/power.h"
#include "os/os.h"
#include <android/native_window_jni.h>
class power_android {
@ -57,7 +57,7 @@ private:
int nsecs_left;
int percent_left;
PowerState power_state;
OS::PowerState power_state;
bool GetPowerInfo_Android();
bool UpdatePowerInfo();
@ -71,7 +71,7 @@ public:
static struct LocalReferenceHolder LocalReferenceHolder_Setup(const char *func);
static void LocalReferenceHolder_Cleanup(struct LocalReferenceHolder *refholder);
PowerState get_power_state();
OS::PowerState get_power_state();
int get_power_seconds_left();
int get_power_percent_left();
};

2
platform/haiku/os_haiku.h
View file

@ -117,7 +117,7 @@ public:
virtual void get_fullscreen_mode_list(List<VideoMode> *p_list, int p_screen = 0) const;
virtual String get_executable_path() const;
virtual PowerState get_power_state();
virtual OS::PowerState get_power_state();
virtual int get_power_seconds_left();
virtual int get_power_percent_left();

6
platform/haiku/power_haiku.cpp
View file

@ -37,12 +37,12 @@ bool PowerHaiku::UpdatePowerInfo() {
return false;
}
PowerState PowerHaiku::get_power_state() {
OS::PowerState PowerHaiku::get_power_state() {
if (UpdatePowerInfo()) {
return power_state;
} else {
WARN_PRINT("Power management is not implemented on this platform, defaulting to POWERSTATE_UNKNOWN");
return POWERSTATE_UNKNOWN;
return OS::POWERSTATE_UNKNOWN;
}
}
@ -65,7 +65,7 @@ int PowerX11::get_power_percent_left() {
}
PowerHaiku::PowerHaiku()
: nsecs_left(-1), percent_left(-1), power_state(POWERSTATE_UNKNOWN) {
: nsecs_left(-1), percent_left(-1), power_state(OS::POWERSTATE_UNKNOWN) {
}
PowerHaiku::~PowerHaiku() {

6
platform/haiku/power_haiku.h
View file

@ -31,11 +31,13 @@
#ifndef PLATFORM_HAIKU_POWER_HAIKU_H_
#define PLATFORM_HAIKU_POWER_HAIKU_H_
#include <os/os.h>
class PowerHaiku {
private:
int nsecs_left;
int percent_left;
PowerState power_state;
OS::PowerState power_state;
bool UpdatePowerInfo();
@ -43,7 +45,7 @@ public:
PowerHaiku();
virtual ~PowerHaiku();
PowerState get_power_state();
OS::PowerState get_power_state();
int get_power_seconds_left();
int get_power_percent_left();
};

8
platform/iphone/power_iphone.cpp
View file

@ -30,15 +30,15 @@
#include "power_iphone.h"
bool PowerState::UpdatePowerInfo() {
bool OS::PowerState::UpdatePowerInfo() {
return false;
}
PowerState PowerIphone::get_power_state() {
OS::PowerState PowerIphone::get_power_state() {
if (UpdatePowerInfo()) {
return power_state;
} else {
return POWERSTATE_UNKNOWN;
return OS::POWERSTATE_UNKNOWN;
}
}
@ -59,7 +59,7 @@ int PowerIphone::get_power_percent_left() {
}
PowerIphone::PowerIphone()
: nsecs_left(-1), percent_left(-1), power_state(POWERSTATE_UNKNOWN) {
: nsecs_left(-1), percent_left(-1), power_state(OS::POWERSTATE_UNKNOWN) {
// TODO Auto-generated constructor stub
}

6
platform/iphone/power_iphone.h
View file

@ -31,11 +31,13 @@
#ifndef PLATFORM_IPHONE_POWER_IPHONE_H_
#define PLATFORM_IPHONE_POWER_IPHONE_H_
#include <os/os.h>
class PowerIphone {
private:
int nsecs_left;
int percent_left;
PowerState power_state;
OS::PowerState power_state;
bool UpdatePowerInfo();
@ -43,7 +45,7 @@ public:
PowerIphone();
virtual ~PowerIphone();
PowerState get_power_state();
OS::PowerState get_power_state();
int get_power_seconds_left();
int get_power_percent_left();
};

2
platform/javascript/os_javascript.cpp
View file

@ -976,7 +976,7 @@ String OS_JavaScript::get_joy_guid(int p_device) const {
return input->get_joy_guid_remapped(p_device);
}
PowerState OS_JavaScript::get_power_state() {
OS::PowerState OS_JavaScript::get_power_state() {
return power_manager->get_power_state();
}

2
platform/javascript/os_javascript.h
View file

@ -165,7 +165,7 @@ public:
virtual String get_joy_guid(int p_device) const;
bool joy_connection_changed(int p_type, const EmscriptenGamepadEvent *p_event);
virtual PowerState get_power_state();
virtual OS::PowerState get_power_state();
virtual int get_power_seconds_left();
virtual int get_power_percent_left();

6
platform/javascript/power_javascript.cpp
View file

@ -36,12 +36,12 @@ bool PowerJavascript::UpdatePowerInfo() {
return false;
}
PowerState PowerJavascript::get_power_state() {
OS::PowerState PowerJavascript::get_power_state() {
if (UpdatePowerInfo()) {
return power_state;
} else {
WARN_PRINT("Power management is not implemented on this platform, defaulting to POWERSTATE_UNKNOWN");
return POWERSTATE_UNKNOWN;
return OS::POWERSTATE_UNKNOWN;
}
}
@ -64,7 +64,7 @@ int PowerJavascript::get_power_percent_left() {
}
PowerJavascript::PowerJavascript()
: nsecs_left(-1), percent_left(-1), power_state(POWERSTATE_UNKNOWN) {
: nsecs_left(-1), percent_left(-1), power_state(OS::POWERSTATE_UNKNOWN) {
}
PowerJavascript::~PowerJavascript() {

6
platform/javascript/power_javascript.h
View file

@ -31,13 +31,13 @@
#ifndef PLATFORM_JAVASCRIPT_POWER_JAVASCRIPT_H_
#define PLATFORM_JAVASCRIPT_POWER_JAVASCRIPT_H_
#include "os/power.h"
#include "os/os.h"
class PowerJavascript {
private:
int nsecs_left;
int percent_left;
PowerState power_state;
OS::PowerState power_state;
bool UpdatePowerInfo();
@ -45,7 +45,7 @@ public:
PowerJavascript();
virtual ~PowerJavascript();
PowerState get_power_state();
OS::PowerState get_power_state();
int get_power_seconds_left();
int get_power_percent_left();
};

2
platform/osx/os_osx.h
View file

@ -212,7 +212,7 @@ public:
virtual void set_ime_position(const Point2 &p_pos);
virtual void set_ime_intermediate_text_callback(ImeCallback p_callback, void *p_inp);
virtual PowerState get_power_state();
virtual OS::PowerState get_power_state();
virtual int get_power_seconds_left();
virtual int get_power_percent_left();

2
platform/osx/os_osx.mm
View file

@ -1901,7 +1901,7 @@ String OS_OSX::get_joy_guid(int p_device) const {
return input->get_joy_guid_remapped(p_device);
}
PowerState OS_OSX::get_power_state() {
OS::PowerState OS_OSX::get_power_state() {
return power_manager->get_power_state();
}

16
platform/osx/power_osx.cpp
View file

@ -174,7 +174,7 @@ bool power_osx::GetPowerInfo_MacOSX() {
nsecs_left = -1;
percent_left = -1;
power_state = POWERSTATE_UNKNOWN;
power_state = OS::POWERSTATE_UNKNOWN;
if (blob != NULL) {
CFArrayRef list = IOPSCopyPowerSourcesList(blob);
@ -194,13 +194,13 @@ bool power_osx::GetPowerInfo_MacOSX() {
}
if (!have_battery) {
power_state = POWERSTATE_NO_BATTERY;
power_state = OS::POWERSTATE_NO_BATTERY;
} else if (charging) {
power_state = POWERSTATE_CHARGING;
power_state = OS::POWERSTATE_CHARGING;
} else if (have_ac) {
power_state = POWERSTATE_CHARGED;
power_state = OS::POWERSTATE_CHARGED;
} else {
power_state = POWERSTATE_ON_BATTERY;
power_state = OS::POWERSTATE_ON_BATTERY;
}
CFRelease(list);
@ -218,11 +218,11 @@ bool power_osx::UpdatePowerInfo() {
return false;
}
PowerState power_osx::get_power_state() {
OS::PowerState power_osx::get_power_state() {
if (UpdatePowerInfo()) {
return power_state;
} else {
return POWERSTATE_UNKNOWN;
return OS::POWERSTATE_UNKNOWN;
}
}
@ -243,7 +243,7 @@ int power_osx::get_power_percent_left() {
}
power_osx::power_osx()
: nsecs_left(-1), percent_left(-1), power_state(POWERSTATE_UNKNOWN) {
: nsecs_left(-1), percent_left(-1), power_state(OS::POWERSTATE_UNKNOWN) {
}
power_osx::~power_osx() {

6
platform/osx/power_osx.h
View file

@ -33,7 +33,7 @@
#include "dir_access_osx.h"
#include "os/file_access.h"
#include "os/power.h"
#include "os/os.h"
#include <CoreFoundation/CoreFoundation.h>
class power_osx {
@ -41,7 +41,7 @@ class power_osx {
private:
int nsecs_left;
int percent_left;
PowerState power_state;
OS::PowerState power_state;
void checkps(CFDictionaryRef dict, bool *have_ac, bool *have_battery, bool *charging);
bool GetPowerInfo_MacOSX(/*PowerState * state, int *seconds, int *percent*/);
bool UpdatePowerInfo();
@ -50,7 +50,7 @@ public:
power_osx();
virtual ~power_osx();
PowerState get_power_state();
OS::PowerState get_power_state();
int get_power_seconds_left();
int get_power_percent_left();
};

2
platform/server/os_server.cpp
View file

@ -200,7 +200,7 @@ void OS_Server::move_window_to_foreground() {
void OS_Server::set_cursor_shape(CursorShape p_shape) {
}
PowerState OS_Server::get_power_state() {
OS::PowerState OS_Server::get_power_state() {
return power_manager->get_power_state();
}

2
platform/server/os_server.h
View file

@ -106,7 +106,7 @@ public:
void run();
virtual PowerState get_power_state();
virtual OS::PowerState get_power_state();
virtual int get_power_seconds_left();
virtual int get_power_percent_left();

2
platform/uwp/os_uwp.cpp
View file

@ -855,7 +855,7 @@ bool OSUWP::_check_internal_feature_support(const String &p_feature) {
return p_feature == "pc" || p_feature == "s3tc";
}
PowerState OSUWP::get_power_state() {
OS::PowerState OSUWP::get_power_state() {
return power_manager->get_power_state();
}

2
platform/uwp/os_uwp.h
View file

@ -259,7 +259,7 @@ public:
void input_event(const Ref<InputEvent> &p_event);
virtual PowerState get_power_state();
virtual OS::PowerState get_power_state();
virtual int get_power_seconds_left();
virtual int get_power_percent_left();

6
platform/uwp/power_uwp.cpp
View file

@ -31,7 +31,7 @@
#include "power_uwp.h"
PowerUWP::PowerUWP()
: nsecs_left(-1), percent_left(-1), power_state(POWERSTATE_UNKNOWN) {
: nsecs_left(-1), percent_left(-1), power_state(OS::POWERSTATE_UNKNOWN) {
}
PowerUWP::~PowerUWP() {
@ -47,12 +47,12 @@ bool PowerUWP::UpdatePowerInfo() {
return false;
}
PowerState PowerUWP::get_power_state() {
OS::PowerState PowerUWP::get_power_state() {
if (UpdatePowerInfo()) {
return power_state;
} else {
WARN_PRINT("Power management is not implemented on this platform, defaulting to POWERSTATE_UNKNOWN");
return POWERSTATE_UNKNOWN;
return OS::POWERSTATE_UNKNOWN;
}
}

6
platform/uwp/power_uwp.h
View file

@ -33,14 +33,14 @@
#include "os/dir_access.h"
#include "os/file_access.h"
#include "os/power.h"
#include "os/os.h"
class PowerUWP {
private:
int nsecs_left;
int percent_left;
PowerState power_state;
OS::PowerState power_state;
bool UpdatePowerInfo();
@ -48,7 +48,7 @@ public:
PowerUWP();
virtual ~PowerUWP();
PowerState get_power_state();
OS::PowerState get_power_state();
int get_power_seconds_left();
int get_power_percent_left();
};

2
platform/windows/os_windows.cpp
View file

@ -2331,7 +2331,7 @@ bool OS_Windows::is_vsync_enabled() const {
return true;
}
PowerState OS_Windows::get_power_state() {
OS::PowerState OS_Windows::get_power_state() {
return power_manager->get_power_state();
}

2
platform/windows/os_windows.h
View file

@ -278,7 +278,7 @@ public:
virtual void set_use_vsync(bool p_enable);
virtual bool is_vsync_enabled() const;
virtual PowerState get_power_state();
virtual OS::PowerState get_power_state();
virtual int get_power_seconds_left();
virtual int get_power_percent_left();

18
platform/windows/power_windows.cpp
View file

@ -64,19 +64,19 @@ bool PowerWindows::GetPowerInfo_Windows() {
/* This API should exist back to Win95. */
if (!GetSystemPowerStatus(&status)) {
/* !!! FIXME: push GetLastError() into GetError() */
power_state = POWERSTATE_UNKNOWN;
power_state = OS::POWERSTATE_UNKNOWN;
} else if (status.BatteryFlag == 0xFF) { /* unknown state */
power_state = POWERSTATE_UNKNOWN;
power_state = OS::POWERSTATE_UNKNOWN;
} else if (status.BatteryFlag & (1 << 7)) { /* no battery */
power_state = POWERSTATE_NO_BATTERY;
power_state = OS::POWERSTATE_NO_BATTERY;
} else if (status.BatteryFlag & (1 << 3)) { /* charging */
power_state = POWERSTATE_CHARGING;
power_state = OS::POWERSTATE_CHARGING;
need_details = TRUE;
} else if (status.ACLineStatus == 1) {
power_state = POWERSTATE_CHARGED; /* on AC, not charging. */
power_state = OS::POWERSTATE_CHARGED; /* on AC, not charging. */
need_details = TRUE;
} else {
power_state = POWERSTATE_ON_BATTERY; /* not on AC. */
power_state = OS::POWERSTATE_ON_BATTERY; /* not on AC. */
need_details = TRUE;
}
@ -97,11 +97,11 @@ bool PowerWindows::GetPowerInfo_Windows() {
return TRUE; /* always the definitive answer on Windows. */
}
PowerState PowerWindows::get_power_state() {
OS::PowerState PowerWindows::get_power_state() {
if (GetPowerInfo_Windows()) {
return power_state;
} else {
return POWERSTATE_UNKNOWN;
return OS::POWERSTATE_UNKNOWN;
}
}
@ -122,7 +122,7 @@ int PowerWindows::get_power_percent_left() {
}
PowerWindows::PowerWindows()
: nsecs_left(-1), percent_left(-1), power_state(POWERSTATE_UNKNOWN) {
: nsecs_left(-1), percent_left(-1), power_state(OS::POWERSTATE_UNKNOWN) {
}
PowerWindows::~PowerWindows() {

6
platform/windows/power_windows.h
View file

@ -33,7 +33,7 @@
#include "os/dir_access.h"
#include "os/file_access.h"
#include "os/power.h"
#include "os/os.h"
#include <windows.h>
@ -42,7 +42,7 @@ class PowerWindows {
private:
int nsecs_left;
int percent_left;
PowerState power_state;
OS::PowerState power_state;
bool GetPowerInfo_Windows();
@ -50,7 +50,7 @@ public:
PowerWindows();
virtual ~PowerWindows();
PowerState get_power_state();
OS::PowerState get_power_state();
int get_power_seconds_left();
int get_power_percent_left();
};

2
platform/x11/os_x11.cpp
View file

@ -2149,7 +2149,7 @@ void OS_X11::set_context(int p_context) {
}
}
PowerState OS_X11::get_power_state() {
OS::PowerState OS_X11::get_power_state() {
return power_manager->get_power_state();
}

2
platform/x11/os_x11.h
View file

@ -265,7 +265,7 @@ public:
virtual void set_use_vsync(bool p_enable);
virtual bool is_vsync_enabled() const;
virtual PowerState get_power_state();
virtual OS::PowerState get_power_state();
virtual int get_power_seconds_left();
virtual int get_power_percent_left();

42
platform/x11/power_x11.cpp
View file

@ -252,7 +252,7 @@ bool PowerX11::GetPowerInfo_Linux_proc_acpi() {
this->nsecs_left = -1;
this->percent_left = -1;
this->power_state = POWERSTATE_UNKNOWN;
this->power_state = OS::POWERSTATE_UNKNOWN;
dirp->change_dir(proc_acpi_battery_path);
Error err = dirp->list_dir_begin();
@ -282,13 +282,13 @@ bool PowerX11::GetPowerInfo_Linux_proc_acpi() {
}
if (!have_battery) {
this->power_state = POWERSTATE_NO_BATTERY;
this->power_state = OS::POWERSTATE_NO_BATTERY;
} else if (charging) {
this->power_state = POWERSTATE_CHARGING;
this->power_state = OS::POWERSTATE_CHARGING;
} else if (have_ac) {
this->power_state = POWERSTATE_CHARGED;
this->power_state = OS::POWERSTATE_CHARGED;
} else {
this->power_state = POWERSTATE_ON_BATTERY;
this->power_state = OS::POWERSTATE_ON_BATTERY;
}
return true; /* definitive answer. */
@ -400,17 +400,17 @@ bool PowerX11::GetPowerInfo_Linux_proc_apm() {
}
if (battery_flag == 0xFF) { /* unknown state */
this->power_state = POWERSTATE_UNKNOWN;
this->power_state = OS::POWERSTATE_UNKNOWN;
} else if (battery_flag & (1 << 7)) { /* no battery */
this->power_state = POWERSTATE_NO_BATTERY;
this->power_state = OS::POWERSTATE_NO_BATTERY;
} else if (battery_flag & (1 << 3)) { /* charging */
this->power_state = POWERSTATE_CHARGING;
this->power_state = OS::POWERSTATE_CHARGING;
need_details = true;
} else if (ac_status == 1) {
this->power_state = POWERSTATE_CHARGED; /* on AC, not charging. */
this->power_state = OS::POWERSTATE_CHARGED; /* on AC, not charging. */
need_details = true;
} else {
this->power_state = POWERSTATE_ON_BATTERY;
this->power_state = OS::POWERSTATE_ON_BATTERY;
need_details = true;
}
@ -445,7 +445,7 @@ bool PowerX11::GetPowerInfo_Linux_sys_class_power_supply(/*PowerState *state, in
return false;
}
this->power_state = POWERSTATE_NO_BATTERY; /* assume we're just plugged in. */
this->power_state = OS::POWERSTATE_NO_BATTERY; /* assume we're just plugged in. */
this->nsecs_left = -1;
this->percent_left = -1;
@ -454,7 +454,7 @@ bool PowerX11::GetPowerInfo_Linux_sys_class_power_supply(/*PowerState *state, in
while (name != "") {
bool choose = false;
char str[64];
PowerState st;
OS::PowerState st;
int secs;
int pct;
@ -475,17 +475,17 @@ bool PowerX11::GetPowerInfo_Linux_sys_class_power_supply(/*PowerState *state, in
/* some drivers don't offer this, so if it's not explicitly reported assume it's present. */
if (read_power_file(base, name.utf8().get_data(), "present", str, sizeof(str)) && (String(str) == "0\n")) {
st = POWERSTATE_NO_BATTERY;
st = OS::POWERSTATE_NO_BATTERY;
} else if (!read_power_file(base, name.utf8().get_data(), "status", str, sizeof(str))) {
st = POWERSTATE_UNKNOWN; /* uh oh */
st = OS::POWERSTATE_UNKNOWN; /* uh oh */
} else if (String(str) == "Charging\n") {
st = POWERSTATE_CHARGING;
st = OS::POWERSTATE_CHARGING;
} else if (String(str) == "Discharging\n") {
st = POWERSTATE_ON_BATTERY;
st = OS::POWERSTATE_ON_BATTERY;
} else if ((String(str) == "Full\n") || (String(str) == "Not charging\n")) {
st = POWERSTATE_CHARGED;
st = OS::POWERSTATE_CHARGED;
} else {
st = POWERSTATE_UNKNOWN; /* uh oh */
st = OS::POWERSTATE_UNKNOWN; /* uh oh */
}
if (!read_power_file(base, name.utf8().get_data(), "capacity", str, sizeof(str))) {
@ -543,17 +543,17 @@ bool PowerX11::UpdatePowerInfo() {
}
PowerX11::PowerX11()
: nsecs_left(-1), percent_left(-1), power_state(POWERSTATE_UNKNOWN) {
: nsecs_left(-1), percent_left(-1), power_state(OS::POWERSTATE_UNKNOWN) {
}
PowerX11::~PowerX11() {
}
PowerState PowerX11::get_power_state() {
OS::PowerState PowerX11::get_power_state() {
if (UpdatePowerInfo()) {
return power_state;
} else {
return POWERSTATE_UNKNOWN;
return OS::POWERSTATE_UNKNOWN;
}
}

6
platform/x11/power_x11.h
View file

@ -33,14 +33,14 @@
#include "os/dir_access.h"
#include "os/file_access.h"
#include "os/power.h"
#include "os/os.h"
class PowerX11 {
private:
int nsecs_left;
int percent_left;
PowerState power_state;
OS::PowerState power_state;
FileAccessRef open_power_file(const char *base, const char *node, const char *key);
bool read_power_file(const char *base, const char *node, const char *key, char *buf, size_t buflen);
@ -58,7 +58,7 @@ public:
PowerX11();
virtual ~PowerX11();
PowerState get_power_state();
OS::PowerState get_power_state();
int get_power_seconds_left();
int get_power_percent_left();
};