noahbackus/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 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

12
core/bind/core_bind.cpp
View File

@@ -440,7 +440,7 @@ bool _OS::is_vsync_enabled() const {
return OS::get_singleton()->is_vsync_enabled();
}
PowerState _OS::get_power_state() {
OS::PowerState _OS::get_power_state() {
return OS::get_singleton()->get_power_state();
}
@@ -1142,11 +1142,11 @@ void _OS::_bind_methods() {
BIND_ENUM_CONSTANT(SYSTEM_DIR_PICTURES);
BIND_ENUM_CONSTANT(SYSTEM_DIR_RINGTONES);
BIND_ENUM_CONSTANT(POWERSTATE_UNKNOWN);
BIND_ENUM_CONSTANT(POWERSTATE_ON_BATTERY);
BIND_ENUM_CONSTANT(POWERSTATE_NO_BATTERY);
BIND_ENUM_CONSTANT(POWERSTATE_CHARGING);
BIND_ENUM_CONSTANT(POWERSTATE_CHARGED);
BIND_ENUM_CONSTANT(OS::POWERSTATE_UNKNOWN);
BIND_ENUM_CONSTANT(OS::POWERSTATE_ON_BATTERY);
BIND_ENUM_CONSTANT(OS::POWERSTATE_NO_BATTERY);
BIND_ENUM_CONSTANT(OS::POWERSTATE_CHARGING);
BIND_ENUM_CONSTANT(OS::POWERSTATE_CHARGED);
}
_OS::_OS() {

4
core/bind/core_bind.h
View File

@@ -36,7 +36,7 @@
#include "io/resource_saver.h"
#include "os/dir_access.h"
#include "os/file_access.h"
#include "os/power.h"
#include "os/os.h"
#include "os/semaphore.h"
#include "os/thread.h"
@@ -303,7 +303,7 @@ public:
void set_use_vsync(bool p_enable);
bool is_vsync_enabled() const;
PowerState get_power_state();
OS::PowerState get_power_state();
int get_power_seconds_left();
int get_power_percent_left();

2
core/os/os.cpp
View File

@@ -485,7 +485,7 @@ bool OS::is_vsync_enabled() const {
return true;
}
PowerState OS::get_power_state() {
OS::PowerState OS::get_power_state() {
return POWERSTATE_UNKNOWN;
}
int OS::get_power_seconds_left() {

13
core/os/os.h
View File

@@ -34,7 +34,6 @@
#include "image.h"
#include "list.h"
#include "os/main_loop.h"
#include "power.h"
#include "ustring.h"
#include "vector.h"
#include <stdarg.h>
@@ -65,6 +64,14 @@ class OS {
public:
typedef void (*ImeCallback)(void *p_inp, String p_text, Point2 p_selection);
enum PowerState {
POWERSTATE_UNKNOWN, /**< cannot determine power status */
POWERSTATE_ON_BATTERY, /**< Not plugged in, running on the battery */
POWERSTATE_NO_BATTERY, /**< Plugged in, no battery available */
POWERSTATE_CHARGING, /**< Plugged in, charging battery */
POWERSTATE_CHARGED /**< Plugged in, battery charged */
};
enum RenderThreadMode {
RENDER_THREAD_UNSAFE,
@@ -410,7 +417,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();
@@ -428,6 +435,6 @@ public:
virtual ~OS();
};
VARIANT_ENUM_CAST(PowerState);
VARIANT_ENUM_CAST(OS::PowerState);
#endif

42
core/os/power.h
View File

@@ -1,42 +0,0 @@
/*************************************************************************/
/* power.h */
/*************************************************************************/
/* This file is part of: */
/* GODOT ENGINE */
/* https://godotengine.org */
/*************************************************************************/
/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md) */
/* */
/* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */
/* "Software"), to deal in the Software without restriction, including */
/* without limitation the rights to use, copy, modify, merge, publish, */
/* distribute, sublicense, and/or sell copies of the Software, and to */
/* permit persons to whom the Software is furnished to do so, subject to */
/* the following conditions: */
/* */
/* The above copyright notice and this permission notice shall be */
/* included in all copies or substantial portions of the Software. */
/* */
/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#ifndef CORE_OS_POWER_H_
#define CORE_OS_POWER_H_
typedef enum {
POWERSTATE_UNKNOWN, /**< cannot determine power status */
POWERSTATE_ON_BATTERY, /**< Not plugged in, running on the battery */
POWERSTATE_NO_BATTERY, /**< Plugged in, no battery available */
POWERSTATE_CHARGING, /**< Plugged in, charging battery */
POWERSTATE_CHARGED /**< Plugged in, battery charged */
} PowerState;
#endif /* CORE_OS_POWER_H_ */

1
core/variant.h
View File

@@ -43,7 +43,6 @@
#include "math_2d.h"
#include "matrix3.h"
#include "node_path.h"
#include "os/power.h"
#include "plane.h"
#include "quat.h"
#include "rect3.h"