northern-lighthouse/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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();
};