Add power battery% access

core/bind/core_bind.cpp

@@ -455,6 +455,17 @@ bool _OS::is_vsync_enabled() const {
 	return OS::get_singleton()->is_vsync_enabled();
 }
 
+PowerState _OS::get_power_state() {
+	return OS::get_singleton()->get_power_state();
+}
+
+int _OS::get_power_seconds_left() {
+	return OS::get_singleton()->get_power_seconds_left();
+}
+
+int _OS::get_power_percent_left() {
+	return OS::get_singleton()->get_power_percent_left();
+}
 
 /*
 enum Weekday {
@@ -1117,6 +1128,10 @@ void _OS::_bind_methods() {
 
 	ClassDB::bind_method(_MD("set_use_vsync","enable"),&_OS::set_use_vsync);
 	ClassDB::bind_method(_MD("is_vsync_enabled"),&_OS::is_vsync_enabled);
+
+	ClassDB::bind_method(_MD("get_power_state"),&_OS::get_power_state);
+	ClassDB::bind_method(_MD("get_power_seconds_left"),&_OS::get_power_seconds_left);
+	ClassDB::bind_method(_MD("get_power_percent_left"),&_OS::get_power_percent_left);
 
 	BIND_CONSTANT( DAY_SUNDAY );
 	BIND_CONSTANT( DAY_MONDAY );
@@ -1155,6 +1170,12 @@ void _OS::_bind_methods() {
 	BIND_CONSTANT( SYSTEM_DIR_MUSIC );
 	BIND_CONSTANT( SYSTEM_DIR_PICTURES );
 	BIND_CONSTANT( SYSTEM_DIR_RINGTONES );
+
+	BIND_CONSTANT( POWERSTATE_UNKNOWN );
+	BIND_CONSTANT( POWERSTATE_ON_BATTERY );
+	BIND_CONSTANT( POWERSTATE_NO_BATTERY );
+	BIND_CONSTANT( POWERSTATE_CHARGING );
+	BIND_CONSTANT( POWERSTATE_CHARGED );
 
 }
 

core/bind/core_bind.h

@@ -35,6 +35,7 @@
 #include "os/dir_access.h"
 #include "os/thread.h"
 #include "os/semaphore.h"
+#include "os/power.h"
 
 
 class _ResourceLoader : public Object  {
@@ -309,6 +310,10 @@ class _OS : public Object  {
 	void set_use_vsync(bool p_enable);
 	bool is_vsync_enabled() const;
 
+	PowerState get_power_state();
+	int get_power_seconds_left();
+	int get_power_percent_left();
+
 	static _OS *get_singleton() { return singleton; }
 
 	_OS();

core/os/os.cpp

@@ -513,6 +513,16 @@ bool OS::is_vsync_enabled() const{
 }
 
 
+PowerState OS::get_power_state() {
+	return POWERSTATE_UNKNOWN;
+}
+int OS::get_power_seconds_left() {
+	return -1;
+}
+int OS::get_power_percent_left() {
+	return -1;
+}
+
 OS::OS() {
 	last_error=NULL;
 	singleton=this;

core/os/os.h

@@ -34,8 +34,10 @@
 #include "vector.h"
 #include "engine.h"
 #include "os/main_loop.h"
+#include "power.h"
 #include <stdarg.h>
 
+
 /**
 	@author Juan Linietsky <reduzio@gmail.com>
 */
@@ -401,6 +403,10 @@ friend class Main;
 
 	virtual void set_use_vsync(bool p_enable);
 	virtual bool is_vsync_enabled() const;
+
+	virtual PowerState get_power_state();
+	virtual int get_power_seconds_left();
+	virtual int get_power_percent_left();
 
 	bool is_hidpi_allowed() const { return _allow_hidpi; }
 	OS();

core/os/power.h

@@ -0,0 +1,44 @@
+/*************************************************************************/
+/*  power.h                                                              */
+/*************************************************************************/
+/*                       This file is part of:                           */
+/*                           GODOT ENGINE                                */
+/*                    http://www.godotengine.org                         */
+/*************************************************************************/
+/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur.                 */
+/*                                                                       */
+/* 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_ */

platform/android/SCsub

@@ -20,6 +20,7 @@ android_files = [
     'java_glue.cpp',
     'cpu-features.c',
     'java_class_wrapper.cpp'
+	'power_android.cpp'
 ]
 
 # env.Depends('#core/math/vector3.h', 'vector3_psp.h')

platform/android/os_android.cpp

@@ -159,6 +159,8 @@ void OS_Android::initialize(const VideoMode& p_desired,int p_video_driver,int p_
 
 	input = memnew( InputDefault );
 	input->set_fallback_mapping("Default Android Gamepad");
+
+	power_manager = memnew( power_android );
 }
 
 void OS_Android::set_main_loop( MainLoop * p_main_loop ) {

platform/android/os_android.h

@@ -32,6 +32,7 @@
 #include "os/input.h"
 #include "drivers/unix/os_unix.h"
 #include "os/main_loop.h"
+#include "power_android.h"
 #include "servers/physics/physics_server_sw.h"
 #include "servers/audio_server.h"
 #include "servers/physics_2d/physics_2d_server_sw.h"
@@ -142,6 +143,8 @@ class OS_Android : public OS_Unix {
 	SetKeepScreenOnFunc set_keep_screen_on_func;
 	AlertFunc alert_func;
 
+	power_android *power_manager;
+
 public:
 
 	// functions used by main to initialize/deintialize the OS