Welcome in 2017, dear changelog reader!

That year should bring the long-awaited OpenGL ES 3.0 compatible renderer
with state-of-the-art rendering techniques tuned to work as low as middle
end handheld devices - without compromising with the possibilities given
for higher end desktop games of course. Great times ahead for the Godot
community and the gamers that will play our games!

(cherry picked from commit c7bc44d5ad9aae4902280012f7654e2318cd910e)

LICENSE.txt

@@ -1,20 +0,0 @@
-Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.
-Copyright (c) 2014-2020 Godot Engine contributors.
-
-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.

README.md

@@ -1,53 +0,0 @@
-## Godot Engine platform port for Haiku
-
-This is the platform port of [Godot Engine](https://godotengine.org) for the
-[Haiku](https://www.haiku-os.org) operating system.
-
-Haiku is not an officially supported platform in the main tree of Godot, so
-this port is kept separate so that it can be contributed to independently of
-Godot's main release cycle.
-
-It may imply that this port might not be functional for the latest versions of
-Godot. For the time being, neither the `3.2` branch nor the `master` branch are
-functional out-of-the-box on Haiku.
-
-We welcome all contributions from Haiku developers to ensure that each branch
-and Git tag of this repository work as expected with the matching branches and
-tags of the [Godot repository](https://github.com/godotengine/godot/).
-
-## Usage
-
-This code is meant to be copied as `platform/haiku` in the Godot Engine
-[source repository](https://github.com/godotengine/godot/) to make builds of
-Godot for Haiku.
-
-It can also be cloned as a Git submodule:
-
-```
-git clone https://github.com/godotengine/godot
-cd godot
-git submodule add https://github.com/godotengine/godot-haiku-platform platform/haiku
-```
-
-Be sure to use compatible branches for the Godot repository and the Haiku port.
-
-You can then compile Godot for Haiku with:
-
-```
-# Editor build, optimized.
-scons p=haiku tools=yes target=release_debug
-
-# Export template, debug.
-scons p=haiku tools=no target=release_debug
-# Export template, release.
-scons p=haiku tools=no target=release
-```
-
-## License
-
-This port is distributed under the MIT license, with the same copyright as the
-main Godot source repository.
-
-See [LICENSE.txt](/LICENSE.txt) for details, and
-[AUTHORS.md](https://github.com/godotengine/godot/blob/master/AUTHORS.md) in
-the Godot repository for a list of contributors.

SCsub

@@ -1,25 +1,28 @@
 #!/usr/bin/env python
 
-Import("env")
+Import('env')
 
 common_haiku = [
-    "os_haiku.cpp",
-    "context_gl_haiku.cpp",
-    "haiku_application.cpp",
-    "haiku_direct_window.cpp",
-    "haiku_gl_view.cpp",
-    "key_mapping_haiku.cpp",
-    "audio_driver_media_kit.cpp",
+    'os_haiku.cpp',
+    'context_gl_haiku.cpp',
+    'haiku_application.cpp',
+    'haiku_direct_window.cpp',
+    'haiku_gl_view.cpp',
+    'key_mapping_haiku.cpp',
+    'audio_driver_media_kit.cpp'
 ]
 
-target = env.add_program("#bin/godot", ["godot_haiku.cpp"] + common_haiku)
+target = env.Program(
+    '#bin/godot',
+    ['godot_haiku.cpp'] + common_haiku
+)
 
-command = env.Command("#bin/godot.rsrc", "#platform/haiku/godot.rdef", ["rc -o $TARGET $SOURCE"])
+command = env.Command('#bin/godot.rsrc', '#platform/haiku/godot.rdef',
+                      ['rc -o $TARGET $SOURCE'])
 
 
 def addResourcesAction(target=None, source=None, env=None):
-    return env.Execute("xres -o " + File(target)[0].path + " bin/godot.rsrc")
-
+    return env.Execute('xres -o ' + File(target)[0].path + ' bin/godot.rsrc')
 
 env.AddPostAction(target, addResourcesAction)
 env.Depends(target, command)

audio_driver_media_kit.cpp

@@ -3,10 +3,9 @@
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
+/*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2017 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       */
@@ -27,24 +26,23 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-
 #include "audio_driver_media_kit.h"
 
 #ifdef MEDIA_KIT_ENABLED
 
-#include "core/project_settings.h"
+#include "globals.h"
 
-int32_t *AudioDriverMediaKit::samples_in = nullptr;
+int32_t* AudioDriverMediaKit::samples_in = NULL;
 
 Error AudioDriverMediaKit::init() {
 	active = false;
 
-	mix_rate = GLOBAL_GET("audio/mix_rate");
-	speaker_mode = SPEAKER_MODE_STEREO;
+	mix_rate = 44100;
+	output_format = OUTPUT_STEREO;
 	channels = 2;
 
-	int latency = GLOBAL_GET("audio/output_latency");
-	buffer_size = next_power_of_2(latency * mix_rate / 1000);
+	int latency = GLOBAL_DEF("audio/output_latency", 25);
+	buffer_size = nearest_power_of_2(latency * mix_rate / 1000);
 	samples_in = memnew_arr(int32_t, buffer_size * channels);
 
 	media_raw_audio_format format;
@@ -56,25 +54,27 @@ Error AudioDriverMediaKit::init() {
 	format.buffer_size = buffer_size * sizeof(int32_t) * channels;
 
 	player = new BSoundPlayer(
-			&format,
-			"godot_sound_server",
-			AudioDriverMediaKit::PlayBuffer,
-			nullptr,
-			this);
+		&format,
+		"godot_sound_server",
+		AudioDriverMediaKit::PlayBuffer,
+		NULL,
+		this
+	);
 
 	if (player->InitCheck() != B_OK) {
 		fprintf(stderr, "MediaKit ERR: can not create a BSoundPlayer instance\n");
-		ERR_FAIL_COND_V(player == nullptr, ERR_CANT_OPEN);
+		ERR_FAIL_COND_V(player == NULL, ERR_CANT_OPEN);
 	}
 
+	mutex = Mutex::create();
 	player->Start();
 
 	return OK;
 }
 
-void AudioDriverMediaKit::PlayBuffer(void *cookie, void *buffer, size_t size, const media_raw_audio_format &format) {
-	AudioDriverMediaKit *ad = (AudioDriverMediaKit *)cookie;
-	int32_t *buf = (int32_t *)buffer;
+void AudioDriverMediaKit::PlayBuffer(void* cookie, void* buffer, size_t size, const media_raw_audio_format& format) {
+	AudioDriverMediaKit* ad = (AudioDriverMediaKit*) cookie;
+	int32_t* buf = (int32_t*) buffer;
 
 	if (!ad->active) {
 		for (unsigned int i = 0; i < ad->buffer_size * ad->channels; i++) {
@@ -99,22 +99,22 @@ int AudioDriverMediaKit::get_mix_rate() const {
 	return mix_rate;
 }
 
-AudioDriverMediaKit::SpeakerMode AudioDriverMediaKit::get_speaker_mode() const {
-	return speaker_mode;
+AudioDriverSW::OutputFormat AudioDriverMediaKit::get_output_format() const {
+	return output_format;
 }
 
 void AudioDriverMediaKit::lock() {
 	if (!mutex)
 		return;
 
-	mutex.lock();
+	mutex->lock();
 }
 
 void AudioDriverMediaKit::unlock() {
 	if (!mutex)
 		return;
 
-	mutex.unlock();
+	mutex->unlock();
 }
 
 void AudioDriverMediaKit::finish() {
@@ -123,13 +123,20 @@ void AudioDriverMediaKit::finish() {
 	if (samples_in) {
 		memdelete_arr(samples_in);
 	};
+
+	if (mutex) {
+		memdelete(mutex);
+		mutex = NULL;
+	}
 }
 
 AudioDriverMediaKit::AudioDriverMediaKit() {
-	player = nullptr;
+	mutex = NULL;
+	player = NULL;
 }
 
 AudioDriverMediaKit::~AudioDriverMediaKit() {
+
 }
 
 #endif

audio_driver_media_kit.h

@@ -3,10 +3,9 @@
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
+/*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2017 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       */
@@ -27,42 +26,41 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-
-#include "servers/audio_server.h"
+#include "servers/audio/audio_server_sw.h"
 
 #ifdef MEDIA_KIT_ENABLED
 
-#include "core/os/mutex.h"
 #include "core/os/thread.h"
+#include "core/os/mutex.h"
 
 #include <kernel/image.h> // needed for image_id
-
 #include <SoundPlayer.h>
 
-class AudioDriverMediaKit : public AudioDriver {
-	Mutex mutex;
+class AudioDriverMediaKit : public AudioDriverSW {
+	Mutex* mutex;
 
-	BSoundPlayer *player;
-	static int32_t *samples_in;
+	BSoundPlayer* player;
+	static int32_t* samples_in;
 
-	static void PlayBuffer(void *cookie, void *buffer, size_t size, const media_raw_audio_format &format);
+	static void PlayBuffer(void* cookie, void* buffer, size_t size, const media_raw_audio_format& format);
 
 	unsigned int mix_rate;
-	SpeakerMode speaker_mode;
+	OutputFormat output_format;
 	unsigned int buffer_size;
 	int channels;
 
 	bool active;
 
 public:
-	const char *get_name() const {
+
+	const char* get_name() const {
 		return "MediaKit";
 	};
 
 	virtual Error init();
 	virtual void start();
 	virtual int get_mix_rate() const;
-	virtual SpeakerMode get_speaker_mode() const;
+	virtual OutputFormat get_output_format() const;
 	virtual void lock();
 	virtual void unlock();
 	virtual void finish();

context_gl_haiku.cpp

@@ -3,10 +3,9 @@
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
+/*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2017 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       */
@@ -27,17 +26,16 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-
 #include "context_gl_haiku.h"
 
-#if defined(OPENGL_ENABLED)
+#if defined(OPENGL_ENABLED) || defined(LEGACYGL_ENABLED)
 
-ContextGL_Haiku::ContextGL_Haiku(HaikuDirectWindow *p_window) {
+ContextGL_Haiku::ContextGL_Haiku(HaikuDirectWindow* p_window) {
 	window = p_window;
 
 	uint32 type = BGL_RGB | BGL_DOUBLE | BGL_DEPTH;
 	view = new HaikuGLView(window->Bounds(), type);
-
+	
 	use_vsync = false;
 }
 

context_gl_haiku.h

@@ -3,10 +3,9 @@
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
+/*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2017 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       */
@@ -27,35 +26,36 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-
 #ifndef CONTEXT_GL_HAIKU_H
 #define CONTEXT_GL_HAIKU_H
 
-#if defined(OPENGL_ENABLED)
+#if defined(OPENGL_ENABLED) || defined(LEGACYGL_ENABLED)
+
+#include "drivers/gl_context/context_gl.h"
 
 #include "haiku_direct_window.h"
 #include "haiku_gl_view.h"
 
-class ContextGL_Haiku {
+class ContextGL_Haiku : public ContextGL {
 private:
-	HaikuGLView *view;
-	HaikuDirectWindow *window;
-
+	HaikuGLView* view;
+	HaikuDirectWindow* window;
+	
 	bool use_vsync;
 
 public:
-	Error initialize();
-	void release_current();
-	void make_current();
-	void swap_buffers();
-	int get_window_width();
-	int get_window_height();
-
-	void set_use_vsync(bool p_use);
-	bool is_using_vsync() const;
-
-	ContextGL_Haiku(HaikuDirectWindow *p_window);
+	ContextGL_Haiku(HaikuDirectWindow* p_window);
 	~ContextGL_Haiku();
+
+	virtual Error initialize();
+	virtual void release_current();
+	virtual void make_current();
+	virtual void swap_buffers();
+	virtual int get_window_width();
+	virtual int get_window_height();
+	
+	virtual void set_use_vsync(bool p_use);
+	virtual bool is_using_vsync() const;
 };
 
 #endif

detect.py

@@ -11,148 +11,57 @@ def get_name():
 
 
 def can_build():
+    if (os.name != "posix"):
+        return False
 
-    if os.name != "posix" or sys.platform == "darwin":
+    if (sys.platform == "darwin"):
         return False
 
     return True
 
 
 def get_opts():
-    from SCons.Variables import EnumVariable
-
     return [
-        EnumVariable("debug_symbols", "Add debugging symbols to release builds", "yes", ("yes", "no", "full")),
+        ('debug_release', 'Add debug symbols to release version', 'no')
     ]
 
 
 def get_flags():
-
-    return []
+    return [
+    ]
 
 
 def configure(env):
+    is64 = sys.maxsize > 2**32
 
-    ## Build type
+    if (env["bits"] == "default"):
+        if (is64):
+            env["bits"] = "64"
+        else:
+            env["bits"] = "32"
 
-    if env["target"] == "release":
-        env.Prepend(CCFLAGS=["-O3"])
-        if env["debug_symbols"] == "yes":
-            env.Prepend(CCFLAGS=["-g1"])
-        if env["debug_symbols"] == "full":
-            env.Prepend(CCFLAGS=["-g2"])
-
-    elif env["target"] == "release_debug":
-        env.Prepend(CCFLAGS=["-O2", "-DDEBUG_ENABLED"])
-        if env["debug_symbols"] == "yes":
-            env.Prepend(CCFLAGS=["-g1"])
-        if env["debug_symbols"] == "full":
-            env.Prepend(CCFLAGS=["-g2"])
-
-    elif env["target"] == "debug":
-        env.Prepend(CCFLAGS=["-g3", "-DDEBUG_ENABLED"])
-
-    ## Architecture
-
-    is64 = sys.maxsize > 2 ** 32
-    if env["bits"] == "default":
-        env["bits"] = "64" if is64 else "32"
-
-    ## Compiler configuration
+    env.Append(CPPPATH=['#platform/haiku'])
 
     env["CC"] = "gcc-x86"
     env["CXX"] = "g++-x86"
 
-    ## Dependencies
+    if (env["target"] == "release"):
+        if (env["debug_release"] == "yes"):
+            env.Append(CCFLAGS=['-g2'])
+        else:
+            env.Append(CCFLAGS=['-O3', '-ffast-math'])
+    elif (env["target"] == "release_debug"):
+        env.Append(CCFLAGS=['-O2', '-ffast-math', '-DDEBUG_ENABLED'])
+    elif (env["target"] == "debug"):
+        env.Append(CCFLAGS=['-g2', '-Wall', '-DDEBUG_ENABLED', '-DDEBUG_MEMORY_ENABLED'])
 
-    if not env["builtin_libwebp"]:
-        env.ParseConfig("pkg-config libwebp --cflags --libs")
+    # env.Append(CCFLAGS=['-DFREETYPE_ENABLED'])
+    env.Append(CPPFLAGS=['-DPTHREAD_NO_RENAME'])  # TODO: enable when we have pthread_setname_np
+    env.Append(CPPFLAGS=['-DOPENGL_ENABLED', '-DMEDIA_KIT_ENABLED'])
+    env.Append(CPPFLAGS=['-DUNIX_ENABLED', '-DGLES2_ENABLED', '-DGLES_OVER_GL'])
+    env.Append(LIBS=['be', 'game', 'media', 'network', 'bnetapi', 'z', 'GL'])
 
-    # freetype depends on libpng and zlib, so bundling one of them while keeping others
-    # as shared libraries leads to weird issues
-    if env["builtin_freetype"] or env["builtin_libpng"] or env["builtin_zlib"]:
-        env["builtin_freetype"] = True
-        env["builtin_libpng"] = True
-        env["builtin_zlib"] = True
-
-    if not env["builtin_freetype"]:
-        env.ParseConfig("pkg-config freetype2 --cflags --libs")
-
-    if not env["builtin_libpng"]:
-        env.ParseConfig("pkg-config libpng16 --cflags --libs")
-
-    if not env["builtin_bullet"]:
-        # We need at least version 2.88
-        import subprocess
-
-        bullet_version = subprocess.check_output(["pkg-config", "bullet", "--modversion"]).strip()
-        if bullet_version < "2.88":
-            # Abort as system bullet was requested but too old
-            print(
-                "Bullet: System version {0} does not match minimal requirements ({1}). Aborting.".format(
-                    bullet_version, "2.88"
-                )
-            )
-            sys.exit(255)
-        env.ParseConfig("pkg-config bullet --cflags --libs")
-
-    if not env["builtin_enet"]:
-        env.ParseConfig("pkg-config libenet --cflags --libs")
-
-    if not env["builtin_squish"]:
-        env.ParseConfig("pkg-config libsquish --cflags --libs")
-
-    if not env["builtin_zstd"]:
-        env.ParseConfig("pkg-config libzstd --cflags --libs")
-
-    # Sound and video libraries
-    # Keep the order as it triggers chained dependencies (ogg needed by others, etc.)
-
-    if not env["builtin_libtheora"]:
-        env["builtin_libogg"] = False  # Needed to link against system libtheora
-        env["builtin_libvorbis"] = False  # Needed to link against system libtheora
-        env.ParseConfig("pkg-config theora theoradec --cflags --libs")
-
-    if not env["builtin_libvpx"]:
-        env.ParseConfig("pkg-config vpx --cflags --libs")
-
-    if not env["builtin_libvorbis"]:
-        env["builtin_libogg"] = False  # Needed to link against system libvorbis
-        env.ParseConfig("pkg-config vorbis vorbisfile --cflags --libs")
-
-    if not env["builtin_opus"]:
-        env["builtin_libogg"] = False  # Needed to link against system opus
-        env.ParseConfig("pkg-config opus opusfile --cflags --libs")
-
-    if not env["builtin_libogg"]:
-        env.ParseConfig("pkg-config ogg --cflags --libs")
-
-    if env["builtin_libtheora"]:
-        list_of_x86 = ["x86_64", "x86", "i386", "i586"]
-        if any(platform.machine() in s for s in list_of_x86):
-            env["x86_libtheora_opt_gcc"] = True
-
-    if not env["builtin_wslay"]:
-        env.ParseConfig("pkg-config libwslay --cflags --libs")
-
-    if not env["builtin_mbedtls"]:
-        # mbedTLS does not provide a pkgconfig config yet. See https://github.com/ARMmbed/mbedtls/issues/228
-        env.Append(LIBS=["mbedtls", "mbedcrypto", "mbedx509"])
-
-    if not env["builtin_miniupnpc"]:
-        # No pkgconfig file so far, hardcode default paths.
-        env.Prepend(CPPPATH=["/system/develop/headers/x86/miniupnpc"])
-        env.Append(LIBS=["miniupnpc"])
-
-    # On Linux wchar_t should be 32-bits
-    # 16-bit library shouldn't be required due to compiler optimisations
-    if not env["builtin_pcre2"]:
-        env.ParseConfig("pkg-config libpcre2-32 --cflags --libs")
-
-    ## Flags
-
-    env.Prepend(CPPPATH=["#platform/haiku"])
-    env.Append(CPPDEFINES=["UNIX_ENABLED", "OPENGL_ENABLED", "GLES_ENABLED"])
-    env.Append(CPPDEFINES=["MEDIA_KIT_ENABLED"])
-    env.Append(CPPDEFINES=["PTHREAD_NO_RENAME"])  # TODO: enable when we have pthread_setname_np
-    env.Append(LIBS=["be", "game", "media", "network", "bnetapi", "z", "GL"])
+    import methods
+    env.Append(BUILDERS={'GLSL120': env.Builder(action=methods.build_legacygl_headers, suffix='glsl.h', src_suffix='.glsl')})
+    env.Append(BUILDERS={'GLSL': env.Builder(action=methods.build_glsl_headers, suffix='glsl.h', src_suffix='.glsl')})
+    env.Append(BUILDERS={'GLSL120GLES': env.Builder(action=methods.build_gles2_headers, suffix='glsl.h', src_suffix='.glsl')})

godot_haiku.cpp

@@ -3,10 +3,9 @@
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
+/*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2017 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       */
@@ -27,14 +26,13 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-
 #include "main/main.h"
 #include "os_haiku.h"
 
-int main(int argc, char *argv[]) {
+int main(int argc, char* argv[]) {
 	OS_Haiku os;
 
-	Error error = Main::setup(argv[0], argc - 1, &argv[1]);
+	Error error = Main::setup(argv[0], argc-1, &argv[1]);
 	if (error != OK) {
 		return 255;
 	}

haiku_application.cpp

@@ -3,10 +3,9 @@
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
+/*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2017 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       */
@@ -27,9 +26,10 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-
 #include "haiku_application.h"
 
-HaikuApplication::HaikuApplication() :
-		BApplication("application/x-vnd.godot") {
+HaikuApplication::HaikuApplication()
+   : BApplication("application/x-vnd.godot")
+{
+
 }

haiku_application.h

@@ -3,10 +3,9 @@
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
+/*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2017 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       */
@@ -27,17 +26,16 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-
 #ifndef HAIKU_APPLICATION_H
 #define HAIKU_APPLICATION_H
 
 #include <kernel/image.h> // needed for image_id
-
 #include <Application.h>
 
-class HaikuApplication : public BApplication {
+class HaikuApplication : public BApplication
+{
 public:
-	HaikuApplication();
+   HaikuApplication();
 };
 
 #endif

haiku_direct_window.cpp

@@ -3,10 +3,9 @@
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
+/*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2017 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       */
@@ -27,66 +26,62 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-
 #include <UnicodeChar.h>
 
-#include "core/os/keyboard.h"
+#include "main/main.h"
+#include "os/keyboard.h"
 #include "haiku_direct_window.h"
 #include "key_mapping_haiku.h"
-#include "main/main.h"
 
-HaikuDirectWindow::HaikuDirectWindow(BRect p_frame) :
-		BDirectWindow(p_frame, "Godot", B_TITLED_WINDOW, B_QUIT_ON_WINDOW_CLOSE) {
+HaikuDirectWindow::HaikuDirectWindow(BRect p_frame)
+   : BDirectWindow(p_frame, "Godot", B_TITLED_WINDOW, B_QUIT_ON_WINDOW_CLOSE)
+{
 	last_mouse_pos_valid = false;
 	last_buttons_state = 0;
 	last_button_mask = 0;
 	last_key_modifier_state = 0;
-
-	view = nullptr;
-	update_runner = nullptr;
-	input = nullptr;
-	main_loop = nullptr;
 }
 
+
 HaikuDirectWindow::~HaikuDirectWindow() {
+	delete update_runner;
 }
 
-void HaikuDirectWindow::SetHaikuGLView(HaikuGLView *p_view) {
+void HaikuDirectWindow::SetHaikuGLView(HaikuGLView* p_view) {
 	view = p_view;
 }
 
 void HaikuDirectWindow::StartMessageRunner() {
 	update_runner = new BMessageRunner(BMessenger(this),
-			new BMessage(REDRAW_MSG), 1000000 / 60 /* 60 fps */);
+		new BMessage(REDRAW_MSG), 1000000/30 /* 30 fps */);
 }
 
 void HaikuDirectWindow::StopMessageRunner() {
 	delete update_runner;
 }
 
-void HaikuDirectWindow::SetInput(InputDefault *p_input) {
+void HaikuDirectWindow::SetInput(InputDefault* p_input) {
 	input = p_input;
 }
 
-void HaikuDirectWindow::SetMainLoop(MainLoop *p_main_loop) {
+void HaikuDirectWindow::SetMainLoop(MainLoop* p_main_loop) {
 	main_loop = p_main_loop;
 }
 
 bool HaikuDirectWindow::QuitRequested() {
-	StopMessageRunner();
-	main_loop->notification(NOTIFICATION_WM_CLOSE_REQUEST);
+	main_loop->notification(MainLoop::NOTIFICATION_WM_QUIT_REQUEST);
 	return false;
 }
 
-void HaikuDirectWindow::DirectConnected(direct_buffer_info *info) {
+void HaikuDirectWindow::DirectConnected(direct_buffer_info* info) {
 	view->DirectConnected(info);
 	view->EnableDirectMode(true);
 }
 
-void HaikuDirectWindow::MessageReceived(BMessage *message) {
+void HaikuDirectWindow::MessageReceived(BMessage* message) {
 	switch (message->what) {
 		case REDRAW_MSG:
-			if (Main::iteration()) {
+			if (Main::iteration() == true) {
 				view->EnableDirectMode(false);
 				Quit();
 			}
@@ -97,7 +92,7 @@ void HaikuDirectWindow::MessageReceived(BMessage *message) {
 	}
 }
 
-void HaikuDirectWindow::DispatchMessage(BMessage *message, BHandler *handler) {
+void HaikuDirectWindow::DispatchMessage(BMessage* message, BHandler* handler) {
 	switch (message->what) {
 		case B_MOUSE_DOWN:
 		case B_MOUSE_UP:
@@ -138,7 +133,7 @@ void HaikuDirectWindow::DispatchMessage(BMessage *message, BHandler *handler) {
 	}
 }
 
-void HaikuDirectWindow::HandleMouseButton(BMessage *message) {
+void HaikuDirectWindow::HandleMouseButton(BMessage* message) {
 	BPoint where;
 	if (message->FindPoint("where", &where) != B_OK) {
 		return;
@@ -150,50 +145,52 @@ void HaikuDirectWindow::HandleMouseButton(BMessage *message) {
 	last_buttons_state = buttons;
 
 	// TODO: implement the mouse_mode checks
-	/*
-	if (mouse_mode == MOUSE_MODE_CAPTURED) {
-		event.xbutton.x=last_mouse_pos.x;
-		event.xbutton.y=last_mouse_pos.y;
-	}
-	*/
+	//if (mouse_mode == MOUSE_MODE_CAPTURED) {
+	//	event.xbutton.x=last_mouse_pos.x;
+	//	event.xbutton.y=last_mouse_pos.y;
+	//}
 
-	Ref<InputEventMouseButton> mouse_event;
-	mouse_event.instance();
+	InputEvent mouse_event;
+	mouse_event.ID = ++event_id;
+	mouse_event.type = InputEvent::MOUSE_BUTTON;
+	mouse_event.device = 0;
 
-	mouse_event->set_button_mask(GetMouseButtonState(buttons));
-	mouse_event->set_position({ where.x, where.y });
-	mouse_event->set_global_position({ where.x, where.y });
-	GetKeyModifierState(mouse_event, modifiers);
+	mouse_event.mouse_button.mod = GetKeyModifierState(modifiers);
+	mouse_event.mouse_button.button_mask = GetMouseButtonState(buttons);
+	mouse_event.mouse_button.x = where.x;
+	mouse_event.mouse_button.y = where.y;
+	mouse_event.mouse_button.global_x = where.x;
+	mouse_event.mouse_button.global_y = where.y;
 
 	switch (button) {
 		default:
 		case B_PRIMARY_MOUSE_BUTTON:
-			mouse_event->set_button_index(1);
+			mouse_event.mouse_button.button_index = 1;
 			break;
 
 		case B_SECONDARY_MOUSE_BUTTON:
-			mouse_event->set_button_index(2);
+			mouse_event.mouse_button.button_index = 2;
 			break;
 
 		case B_TERTIARY_MOUSE_BUTTON:
-			mouse_event->set_button_index(3);
+			mouse_event.mouse_button.button_index = 3;
 			break;
 	}
 
-	mouse_event->set_pressed(message->what == B_MOUSE_DOWN);
+	mouse_event.mouse_button.pressed = (message->what == B_MOUSE_DOWN);
 
-	if (message->what == B_MOUSE_DOWN && mouse_event->get_button_index() == 1) {
+	if (message->what == B_MOUSE_DOWN && mouse_event.mouse_button.button_index == 1) {
 		int32 clicks = message->FindInt32("clicks");
 
 		if (clicks > 1) {
-			mouse_event->set_doubleclick(true);
+			mouse_event.mouse_button.doubleclick=true;
 		}
 	}
 
 	input->parse_input_event(mouse_event);
 }
 
-void HaikuDirectWindow::HandleMouseMoved(BMessage *message) {
+void HaikuDirectWindow::HandleMouseMoved(BMessage* message) {
 	BPoint where;
 	if (message->FindPoint("where", &where) != B_OK) {
 		return;
@@ -210,49 +207,57 @@ void HaikuDirectWindow::HandleMouseMoved(BMessage *message) {
 
 	Point2i rel = pos - last_mouse_position;
 
-	Ref<InputEventMouseMotion> motion_event;
-	motion_event.instance();
-	GetKeyModifierState(motion_event, modifiers);
+	InputEvent motion_event;
+	motion_event.ID = ++event_id;
+	motion_event.type = InputEvent::MOUSE_MOTION;
+	motion_event.device = 0;
 
-	motion_event->set_button_mask(GetMouseButtonState(buttons));
-	motion_event->set_position({ pos.x, pos.y });
-	input->set_mouse_position(pos);
-	motion_event->set_global_position({ pos.x, pos.y });
-	motion_event->set_speed({ input->get_last_mouse_speed().x,
-			input->get_last_mouse_speed().y });
+	motion_event.mouse_motion.mod = GetKeyModifierState(modifiers);
+	motion_event.mouse_motion.button_mask = GetMouseButtonState(buttons);
+	motion_event.mouse_motion.x = pos.x;
+	motion_event.mouse_motion.y = pos.y;
+	input->set_mouse_pos(pos);
+	motion_event.mouse_motion.global_x = pos.x;
+	motion_event.mouse_motion.global_y = pos.y;
+	motion_event.mouse_motion.speed_x = input->get_mouse_speed().x;
+	motion_event.mouse_motion.speed_y = input->get_mouse_speed().y;
 
-	motion_event->set_relative({ rel.x, rel.y });
+	motion_event.mouse_motion.relative_x = rel.x;
+	motion_event.mouse_motion.relative_y = rel.y;
 
 	last_mouse_position = pos;
 
 	input->parse_input_event(motion_event);
 }
 
-void HaikuDirectWindow::HandleMouseWheelChanged(BMessage *message) {
+void HaikuDirectWindow::HandleMouseWheelChanged(BMessage* message) {
 	float wheel_delta_y = 0;
 	if (message->FindFloat("be:wheel_delta_y", &wheel_delta_y) != B_OK) {
 		return;
 	}
 
-	Ref<InputEventMouseButton> mouse_event;
-	mouse_event.instance();
-	//GetKeyModifierState(mouse_event, modifiers);
+	InputEvent mouse_event;
+	mouse_event.ID = ++event_id;
+	mouse_event.type = InputEvent::MOUSE_BUTTON;
+	mouse_event.device = 0;
 
-	mouse_event->set_button_index(wheel_delta_y < 0 ? 4 : 5);
-	mouse_event->set_button_mask(last_button_mask);
-	mouse_event->set_position({ last_mouse_position.x,
-			last_mouse_position.y });
-	mouse_event->set_global_position({ last_mouse_position.x,
-			last_mouse_position.y });
+	mouse_event.mouse_button.button_index = wheel_delta_y < 0 ? 4 : 5;
+	mouse_event.mouse_button.mod = GetKeyModifierState(last_key_modifier_state);
+	mouse_event.mouse_button.button_mask = last_button_mask;
+	mouse_event.mouse_button.x = last_mouse_position.x;
+	mouse_event.mouse_button.y = last_mouse_position.y;
+	mouse_event.mouse_button.global_x = last_mouse_position.x;
+	mouse_event.mouse_button.global_y = last_mouse_position.y;
 
-	mouse_event->set_pressed(true);
+	mouse_event.mouse_button.pressed = true;
 	input->parse_input_event(mouse_event);
 
-	mouse_event->set_pressed(false);
+	mouse_event.ID = ++event_id;
+	mouse_event.mouse_button.pressed = false;
 	input->parse_input_event(mouse_event);
 }
 
-void HaikuDirectWindow::HandleKeyboardEvent(BMessage *message) {
+void HaikuDirectWindow::HandleKeyboardEvent(BMessage* message) {
 	int32 raw_char = 0;
 	int32 key = 0;
 	int32 modifiers = 0;
@@ -269,31 +274,31 @@ void HaikuDirectWindow::HandleKeyboardEvent(BMessage *message) {
 		return;
 	}
 
-	Ref<InputEventKey> event;
-	event.instance();
-	GetKeyModifierState(event, modifiers);
-	event->set_pressed(message->what == B_KEY_DOWN);
-	event->set_keycode(KeyMappingHaiku::get_keysym(raw_char, key));
-	event->set_physical_keycode(KeyMappingHaiku::get_keysym(raw_char, key));
-	event->set_echo(message->HasInt32("be:key_repeat"));
-	event->set_unicode(0);
+	InputEvent event;
+	event.ID = ++event_id;
+	event.type = InputEvent::KEY;
+	event.device = 0;
+	event.key.mod = GetKeyModifierState(modifiers);
+	event.key.pressed = (message->what == B_KEY_DOWN);
+	event.key.scancode = KeyMappingHaiku::get_keysym(raw_char, key);
+	event.key.echo = message->HasInt32("be:key_repeat");
+	event.key.unicode = 0;
 
-	const char *bytes = nullptr;
+	const char* bytes = NULL;
 	if (message->FindString("bytes", &bytes) == B_OK) {
-		event->set_unicode(BUnicodeChar::FromUTF8(&bytes));
+		event.key.unicode = BUnicodeChar::FromUTF8(&bytes);
 	}
 
-	//make it consistent across platforms.
-	if (event->get_keycode() == KEY_BACKTAB) {
-		event->set_keycode(KEY_TAB);
-		event->set_physical_keycode(KEY_TAB);
-		event->set_shift(true);
+	//make it consistent accross platforms.
+	if (event.key.scancode==KEY_BACKTAB) {
+		event.key.scancode=KEY_TAB;
+		event.key.mod.shift=true;
 	}
 
 	input->parse_input_event(event);
 }
 
-void HaikuDirectWindow::HandleKeyboardModifierEvent(BMessage *message) {
+void HaikuDirectWindow::HandleKeyboardModifierEvent(BMessage* message) {
 	int32 old_modifiers = 0;
 	int32 modifiers = 0;
 
@@ -307,19 +312,20 @@ void HaikuDirectWindow::HandleKeyboardModifierEvent(BMessage *message) {
 
 	int32 key = old_modifiers ^ modifiers;
 
-	Ref<InputEventWithModifiers> event;
-	event.instance();
-	GetKeyModifierState(event, modifiers);
-
-	event->set_shift(key & B_SHIFT_KEY);
-	event->set_alt(key & B_OPTION_KEY);
-	event->set_control(key & B_CONTROL_KEY);
-	event->set_command(key & B_COMMAND_KEY);
+	InputEvent event;
+	event.ID = ++event_id;
+	event.type = InputEvent::KEY;
+	event.device = 0;
+	event.key.mod = GetKeyModifierState(modifiers);
+	event.key.pressed = ((modifiers & key) != 0);
+	event.key.scancode = KeyMappingHaiku::get_modifier_keysym(key);
+	event.key.echo = false;
+	event.key.unicode = 0;
 
 	input->parse_input_event(event);
 }
 
-void HaikuDirectWindow::HandleWindowResized(BMessage *message) {
+void HaikuDirectWindow::HandleWindowResized(BMessage* message) {
 	int32 width = 0;
 	int32 height = 0;
 
@@ -331,13 +337,14 @@ void HaikuDirectWindow::HandleWindowResized(BMessage *message) {
 	current_video_mode->height = height;
 }
 
-inline void HaikuDirectWindow::GetKeyModifierState(Ref<InputEventWithModifiers> event, uint32 p_state) {
+inline InputModifierState HaikuDirectWindow::GetKeyModifierState(uint32 p_state) {
 	last_key_modifier_state = p_state;
+	InputModifierState state;
 
-	event->set_shift(p_state & B_SHIFT_KEY);
-	event->set_control(p_state & B_CONTROL_KEY);
-	event->set_alt(p_state & B_OPTION_KEY);
-	event->set_metakey(p_state & B_COMMAND_KEY);
+	state.shift = (p_state & B_SHIFT_KEY) != 0;
+	state.control = (p_state & B_CONTROL_KEY) != 0;
+	state.alt = (p_state & B_OPTION_KEY) != 0;
+	state.meta = (p_state & B_COMMAND_KEY) != 0;
 
 	return state;
 }

haiku_direct_window.h

@@ -3,10 +3,9 @@
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
+/*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2017 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       */
@@ -27,16 +26,14 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-
 #ifndef HAIKU_DIRECT_WINDOW_H
 #define HAIKU_DIRECT_WINDOW_H
 
 #include <kernel/image.h> // needed for image_id
-
 #include <DirectWindow.h>
 
-#include "core/input/input.h"
 #include "core/os/os.h"
+#include "main/input_default.h"
 
 #include "haiku_gl_view.h"
 
@@ -44,43 +41,45 @@
 #define LOCKGL_MSG 'glck'
 #define UNLOCKGL_MSG 'ulck'
 
-class HaikuDirectWindow : public BDirectWindow {
+class HaikuDirectWindow : public BDirectWindow
+{
 private:
+	unsigned int event_id;
 	Point2i last_mouse_position;
 	bool last_mouse_pos_valid;
 	uint32 last_buttons_state;
 	uint32 last_key_modifier_state;
 	int last_button_mask;
-	OS::VideoMode *current_video_mode;
+	OS::VideoMode* current_video_mode;
 
-	MainLoop *main_loop;
-	InputDefault *input;
-	HaikuGLView *view;
-	BMessageRunner *update_runner;
+	MainLoop* main_loop;
+	InputDefault* input;
+	HaikuGLView* view;
+	BMessageRunner* update_runner;
 
-	void HandleMouseButton(BMessage *message);
-	void HandleMouseMoved(BMessage *message);
-	void HandleMouseWheelChanged(BMessage *message);
-	void HandleWindowResized(BMessage *message);
-	void HandleKeyboardEvent(BMessage *message);
-	void HandleKeyboardModifierEvent(BMessage *message);
-	inline void GetKeyModifierState(Ref<InputEventWithModifiers> event, uint32 p_state);
+	void HandleMouseButton(BMessage* message);
+	void HandleMouseMoved(BMessage* message);
+	void HandleMouseWheelChanged(BMessage* message);
+	void HandleWindowResized(BMessage* message);
+	void HandleKeyboardEvent(BMessage* message);
+	void HandleKeyboardModifierEvent(BMessage* message);
+	inline InputModifierState GetKeyModifierState(uint32 p_state);
 	inline int GetMouseButtonState(uint32 p_state);
 
 public:
 	HaikuDirectWindow(BRect p_frame);
 	~HaikuDirectWindow();
 
-	void SetHaikuGLView(HaikuGLView *p_view);
+	void SetHaikuGLView(HaikuGLView* p_view);
 	void StartMessageRunner();
 	void StopMessageRunner();
-	void SetInput(InputDefault *p_input);
-	void SetMainLoop(MainLoop *p_main_loop);
-	inline void SetVideoMode(OS::VideoMode *video_mode) { current_video_mode = video_mode; };
+	void SetInput(InputDefault* p_input);
+	void SetMainLoop(MainLoop* p_main_loop);
+	inline void SetVideoMode(OS::VideoMode* video_mode) { current_video_mode = video_mode; };
 	virtual bool QuitRequested();
-	virtual void DirectConnected(direct_buffer_info *info);
-	virtual void MessageReceived(BMessage *message);
-	virtual void DispatchMessage(BMessage *message, BHandler *handler);
+	virtual void DirectConnected(direct_buffer_info* info);
+	virtual void MessageReceived(BMessage* message);
+	virtual void DispatchMessage(BMessage* message, BHandler* handler);
 
 	inline Point2i GetLastMousePosition() { return last_mouse_position; };
 	inline int GetLastButtonMask() { return last_button_mask; };

haiku_gl_view.cpp

@@ -3,10 +3,9 @@
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
+/*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2017 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       */
@@ -27,12 +26,12 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-
-#include "haiku_gl_view.h"
 #include "main/main.h"
+#include "haiku_gl_view.h"
 
-HaikuGLView::HaikuGLView(BRect frame, uint32 type) :
-		BGLView(frame, "GodotGLView", B_FOLLOW_ALL_SIDES, 0, type) {
+HaikuGLView::HaikuGLView(BRect frame, uint32 type)
+   : BGLView(frame, "GodotGLView", B_FOLLOW_ALL_SIDES, 0, type)
+{
 }
 
 void HaikuGLView::AttachedToWindow(void) {

haiku_gl_view.h

@@ -3,10 +3,9 @@
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
+/*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2017 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       */
@@ -27,15 +26,14 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-
 #ifndef HAIKU_GL_VIEW_H
 #define HAIKU_GL_VIEW_H
 
 #include <kernel/image.h> // needed for image_id
-
 #include <GLView.h>
 
-class HaikuGLView : public BGLView {
+class HaikuGLView : public BGLView
+{
 public:
 	HaikuGLView(BRect frame, uint32 type);
 	virtual void AttachedToWindow(void);

key_mapping_haiku.cpp

@@ -3,10 +3,9 @@
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
+/*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2017 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       */
@@ -27,11 +26,10 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-
 #include <InterfaceDefs.h>
 
-#include "core/os/keyboard.h"
 #include "key_mapping_haiku.h"
+#include "os/keyboard.h"
 
 struct _HaikuTranslatePair {
 	unsigned int keysym;
@@ -84,7 +82,7 @@ static _HaikuTranslatePair _fn_to_keycode[] = {
 static _HaikuTranslatePair _hb_to_keycode[] = {
 	{ KEY_BACKSPACE, B_BACKSPACE },
 	{ KEY_TAB, B_TAB },
-	{ KEY_ENTER, B_RETURN },
+	{ KEY_RETURN, B_RETURN },
 	{ KEY_CAPSLOCK, B_CAPS_LOCK },
 	{ KEY_ESCAPE, B_ESCAPE },
 	{ KEY_SPACE, B_SPACE },
@@ -138,7 +136,7 @@ static _HaikuTranslatePair _hb_to_keycode[] = {
 	{ KEY_Y, (0x79) },
 	{ KEY_Z, (0x7A) },
 
-	/*
+/*
 { KEY_PLAY, VK_PLAY},// (0xFA)
 { KEY_STANDBY,VK_SLEEP },//(0x5F)
 { KEY_BACK,VK_BROWSER_BACK},// (0xA6)
@@ -179,48 +177,22 @@ static _HaikuTranslatePair _hb_to_keycode[] = {
 };
 
 unsigned int KeyMappingHaiku::get_keysym(int32 raw_char, int32 key) {
-	if (raw_char == B_INSERT && key == 0x64) {
-		return KEY_KP_0;
-	}
-	if (raw_char == B_END && key == 0x58) {
-		return KEY_KP_1;
-	}
-	if (raw_char == B_DOWN_ARROW && key == 0x59) {
-		return KEY_KP_2;
-	}
-	if (raw_char == B_PAGE_DOWN && key == 0x5A) {
-		return KEY_KP_3;
-	}
-	if (raw_char == B_LEFT_ARROW && key == 0x48) {
-		return KEY_KP_4;
-	}
-	if (raw_char == 0x35 && key == 0x49) {
-		return KEY_KP_5;
-	}
-	if (raw_char == B_RIGHT_ARROW && key == 0x4A) {
-		return KEY_KP_6;
-	}
-	if (raw_char == B_HOME && key == 0x37) {
-		return KEY_KP_7;
-	}
-	if (raw_char == B_UP_ARROW && key == 0x38) {
-		return KEY_KP_8;
-	}
-	if (raw_char == B_PAGE_UP && key == 0x39) {
-		return KEY_KP_9;
-	}
-	if (raw_char == 0x2F && key == 0x23) {
-		return KEY_KP_DIVIDE;
-	}
-	if (raw_char == 0x2D && key == 0x25) {
-		return KEY_KP_SUBTRACT;
-	}
-	if (raw_char == B_DELETE && key == 0x65) {
-		return KEY_KP_PERIOD;
-	}
+	if (raw_char == B_INSERT && key == 0x64) { return KEY_KP_0; }
+	if (raw_char == B_END && key == 0x58) { return KEY_KP_1; }
+	if (raw_char == B_DOWN_ARROW && key == 0x59) { return KEY_KP_2; }
+	if (raw_char == B_PAGE_DOWN && key == 0x5A) { return KEY_KP_3; }
+	if (raw_char == B_LEFT_ARROW && key == 0x48) { return KEY_KP_4; }
+	if (raw_char == 0x35 && key == 0x49) { return KEY_KP_5; }
+	if (raw_char == B_RIGHT_ARROW && key == 0x4A) { return KEY_KP_6; }
+	if (raw_char == B_HOME && key == 0x37) { return KEY_KP_7; }
+	if (raw_char == B_UP_ARROW && key == 0x38) { return KEY_KP_8; }
+	if (raw_char == B_PAGE_UP && key == 0x39) { return KEY_KP_9; }
+	if (raw_char == 0x2F && key == 0x23) { return KEY_KP_DIVIDE; }
+	if (raw_char == 0x2D && key == 0x25) { return KEY_KP_SUBTRACT; }
+	if (raw_char == B_DELETE && key == 0x65) { return KEY_KP_PERIOD; }
 
 	if (raw_char == 0x10) {
-		for (int i = 0; _fn_to_keycode[i].keysym != KEY_UNKNOWN; i++) {
+		for(int i = 0; _fn_to_keycode[i].keysym != KEY_UNKNOWN; i++) {
 			if (_fn_to_keycode[i].keycode == key) {
 				return _fn_to_keycode[i].keysym;
 			}
@@ -229,7 +201,7 @@ unsigned int KeyMappingHaiku::get_keysym(int32 raw_char, int32 key) {
 		return KEY_UNKNOWN;
 	}
 
-	for (int i = 0; _hb_to_keycode[i].keysym != KEY_UNKNOWN; i++) {
+	for(int i = 0; _hb_to_keycode[i].keysym != KEY_UNKNOWN; i++) {
 		if (_hb_to_keycode[i].keycode == raw_char) {
 			return _hb_to_keycode[i].keysym;
 		}
@@ -239,7 +211,7 @@ unsigned int KeyMappingHaiku::get_keysym(int32 raw_char, int32 key) {
 }
 
 unsigned int KeyMappingHaiku::get_modifier_keysym(int32 key) {
-	for (int i = 0; _mod_to_keycode[i].keysym != KEY_UNKNOWN; i++) {
+	for(int i = 0; _mod_to_keycode[i].keysym != KEY_UNKNOWN; i++) {
 		if ((_mod_to_keycode[i].keycode & key) != 0) {
 			return _mod_to_keycode[i].keysym;
 		}

key_mapping_haiku.h

@@ -3,10 +3,9 @@
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
+/*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2017 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       */
@@ -27,12 +26,12 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-
 #ifndef KEY_MAPPING_HAIKU_H
 #define KEY_MAPPING_HAIKU_H
 
-class KeyMappingHaiku {
-	KeyMappingHaiku() {}
+class KeyMappingHaiku
+{
+	KeyMappingHaiku() {};
 
 public:
 	static unsigned int get_keysym(int32 raw_char, int32 key);

os_haiku.cpp

@@ -3,10 +3,9 @@
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
+/*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2017 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       */
@@ -27,20 +26,21 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
+#include <Screen.h>
+
+#include "servers/visual/visual_server_raster.h"
+#include "servers/visual/visual_server_wrap_mt.h"
+#include "drivers/gles2/rasterizer_gles2.h"
+#include "servers/physics/physics_server_sw.h"
+//#include "servers/physics_2d/physics_2d_server_wrap_mt.h"
+#include "main/main.h"
 
 #include "os_haiku.h"
 
-#include "drivers/gles2/rasterizer_gles2.h"
-#include "main/main.h"
-#include "servers/physics_3d/physics_server_3d_sw.h"
-#include "servers/rendering/rendering_server_raster.h"
-#include "servers/rendering/rendering_server_wrap_mt.h"
-
-#include <Screen.h>
 
 OS_Haiku::OS_Haiku() {
 #ifdef MEDIA_KIT_ENABLED
-	AudioDriverManager::add_driver(&driver_media_kit);
+	AudioDriverManagerSW::add_driver(&driver_media_kit);
 #endif
 };
 
@@ -53,8 +53,8 @@ void OS_Haiku::run() {
 	context_gl->release_current();
 
 	// TODO: clean up
-	BMessenger *bms = new BMessenger(window);
-	BMessage *msg = new BMessage();
+	BMessenger* bms = new BMessenger(window);
+	BMessage* msg = new BMessage();
 	bms->SendMessage(LOCKGL_MSG, msg);
 
 	window->StartMessageRunner();
@@ -68,7 +68,7 @@ void OS_Haiku::run() {
 	main_loop->finish();
 }
 
-String OS_Haiku::get_name() const {
+String OS_Haiku::get_name() {
 	return "Haiku";
 }
 
@@ -76,16 +76,16 @@ int OS_Haiku::get_video_driver_count() const {
 	return 1;
 }
 
-const char *OS_Haiku::get_video_driver_name(int p_driver) const {
+const char* OS_Haiku::get_video_driver_name(int p_driver) const {
 	return "GLES2";
 }
 
-int OS_Haiku::get_current_video_driver() const {
-	return video_driver_index;
+OS::VideoMode OS_Haiku::get_default_video_mode() const {
+	return OS::VideoMode(800, 600, false);
 }
 
-Error OS_Haiku::initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver) {
-	main_loop = nullptr;
+void OS_Haiku::initialize(const VideoMode& p_desired, int p_video_driver, int p_audio_driver) {
+	main_loop = NULL;
 	current_video_mode = p_desired;
 
 	app = new HaikuApplication();
@@ -106,35 +106,50 @@ Error OS_Haiku::initialize(const VideoMode &p_desired, int p_video_driver, int p
 		window->SetFlags(flags);
 	}
 
-#if defined(OPENGL_ENABLED)
+#if defined(OPENGL_ENABLED) || defined(LEGACYGL_ENABLED)
 	context_gl = memnew(ContextGL_Haiku(window));
 	context_gl->initialize();
 	context_gl->make_current();
-	context_gl->set_use_vsync(current_video_mode.use_vsync);
-	// FIXME: That's not how the rasterizer setup should happen.
-	RasterizerGLES2::register_config();
-	RasterizerGLES2::make_current();
+
+	rasterizer = memnew(RasterizerGLES2);
 #endif
 
-	rendering_server = memnew(RenderingServerRaster);
-	// FIXME: Reimplement threaded rendering
-	if (get_render_thread_mode() != RENDER_THREAD_UNSAFE) {
-		rendering_server = memnew(RenderingServerWrapMT(rendering_server, false));
-	}
+	visual_server = memnew(VisualServerRaster(rasterizer));
 
-	ERR_FAIL_COND_V(!rendering_server, ERR_UNAVAILABLE);
+	ERR_FAIL_COND(!visual_server);
 
-	video_driver_index = p_video_driver;
+	// TODO: enable multithreaded VS
+	//if (get_render_thread_mode() != RENDER_THREAD_UNSAFE) {
+	//	visual_server = memnew(VisualServerWrapMT(visual_server, get_render_thread_mode() == RENDER_SEPARATE_THREAD));
+	//}
 
 	input = memnew(InputDefault);
 	window->SetInput(input);
 
 	window->Show();
-	rendering_server->init();
+	visual_server->init();
 
-	AudioDriverManager::initialize(p_audio_driver);
+	physics_server = memnew(PhysicsServerSW);
+	physics_server->init();
+	physics_2d_server = memnew(Physics2DServerSW);
+	// TODO: enable multithreaded PS
+	//physics_2d_server = Physics2DServerWrapMT::init_server<Physics2DServerSW>();
+	physics_2d_server->init();
 
-	return OK;
+	AudioDriverManagerSW::get_driver(p_audio_driver)->set_singleton();
+
+	if (AudioDriverManagerSW::get_driver(p_audio_driver)->init() != OK) {
+		ERR_PRINT("Initializing audio failed.");
+	}
+
+	sample_manager = memnew(SampleManagerMallocSW);
+	audio_server = memnew(AudioServerSW(sample_manager));
+	audio_server->init();
+
+	spatial_sound_server = memnew(SpatialSoundServerSW);
+	spatial_sound_server->init();
+	spatial_sound_2d_server = memnew(SpatialSound2DServerSW);
+	spatial_sound_2d_server->init();
 }
 
 void OS_Haiku::finalize() {
@@ -142,25 +157,43 @@ void OS_Haiku::finalize() {
 		memdelete(main_loop);
 	}
 
-	main_loop = nullptr;
+	main_loop = NULL;
 
-	rendering_server->finish();
-	memdelete(rendering_server);
+	spatial_sound_server->finish();
+	memdelete(spatial_sound_server);
+
+	spatial_sound_2d_server->finish();
+	memdelete(spatial_sound_2d_server);
+
+	memdelete(sample_manager);
+
+	audio_server->finish();
+	memdelete(audio_server);
+
+	visual_server->finish();
+	memdelete(visual_server);
+	memdelete(rasterizer);
+
+	physics_server->finish();
+	memdelete(physics_server);
+
+	physics_2d_server->finish();
+	memdelete(physics_2d_server);
 
 	memdelete(input);
 
-#if defined(OPENGL_ENABLED)
+#if defined(OPENGL_ENABLED) || defined(LEGACYGL_ENABLED)
 	memdelete(context_gl);
 #endif
 }
 
-void OS_Haiku::set_main_loop(MainLoop *p_main_loop) {
+void OS_Haiku::set_main_loop(MainLoop* p_main_loop) {
 	main_loop = p_main_loop;
 	input->set_main_loop(p_main_loop);
 	window->SetMainLoop(p_main_loop);
 }
 
-MainLoop *OS_Haiku::get_main_loop() const {
+MainLoop* OS_Haiku::get_main_loop() const {
 	return main_loop;
 }
 
@@ -169,8 +202,8 @@ void OS_Haiku::delete_main_loop() {
 		memdelete(main_loop);
 	}
 
-	main_loop = nullptr;
-	window->SetMainLoop(nullptr);
+	main_loop = NULL;
+	window->SetMainLoop(NULL);
 }
 
 void OS_Haiku::release_rendering_thread() {
@@ -190,7 +223,7 @@ void OS_Haiku::swap_buffers() {
 	context_gl->swap_buffers();
 }
 
-Point2 OS_Haiku::get_mouse_position() const {
+Point2 OS_Haiku::get_mouse_pos() const {
 	return window->GetLastMousePosition();
 }
 
@@ -202,14 +235,6 @@ void OS_Haiku::set_cursor_shape(CursorShape p_shape) {
 	//ERR_PRINT("set_cursor_shape() NOT IMPLEMENTED");
 }
 
-OS::CursorShape OS_Haiku::get_cursor_shape() const {
-	// TODO: implement get_cursor_shape
-}
-
-void OS_Haiku::set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot) {
-	// TODO
-}
-
 int OS_Haiku::get_screen_count() const {
 	// TODO: implement get_screen_count()
 	return 1;
@@ -226,7 +251,7 @@ void OS_Haiku::set_current_screen(int p_screen) {
 
 Point2 OS_Haiku::get_screen_position(int p_screen) const {
 	// TODO: make this work with the p_screen parameter
-	BScreen *screen = new BScreen(window);
+	BScreen* screen = new BScreen(window);
 	BRect frame = screen->Frame();
 	delete screen;
 	return Point2i(frame.left, frame.top);
@@ -234,13 +259,13 @@ Point2 OS_Haiku::get_screen_position(int p_screen) const {
 
 Size2 OS_Haiku::get_screen_size(int p_screen) const {
 	// TODO: make this work with the p_screen parameter
-	BScreen *screen = new BScreen(window);
+	BScreen* screen = new BScreen(window);
 	BRect frame = screen->Frame();
 	delete screen;
 	return Size2i(frame.IntegerWidth() + 1, frame.IntegerHeight() + 1);
 }
 
-void OS_Haiku::set_window_title(const String &p_title) {
+void OS_Haiku::set_window_title(const String& p_title) {
 	window->SetTitle(p_title.utf8().get_data());
 }
 
@@ -260,14 +285,14 @@ Point2 OS_Haiku::get_window_position() const {
 	return Point2i(point.x, point.y);
 }
 
-void OS_Haiku::set_window_position(const Point2 &p_position) {
+void OS_Haiku::set_window_position(const Point2& p_position) {
 	window->MoveTo(p_position.x, p_position.y);
 }
 
 void OS_Haiku::set_window_fullscreen(bool p_enabled) {
 	window->SetFullScreen(p_enabled);
 	current_video_mode.fullscreen = p_enabled;
-	rendering_server->init();
+	visual_server->init();
 }
 
 bool OS_Haiku::is_window_fullscreen() const {
@@ -307,7 +332,7 @@ bool OS_Haiku::is_window_maximized() const {
 	return !window->IsMinimized();
 }
 
-void OS_Haiku::set_video_mode(const VideoMode &p_video_mode, int p_screen) {
+void OS_Haiku::set_video_mode(const VideoMode& p_video_mode, int p_screen) {
 	ERR_PRINT("set_video_mode() NOT IMPLEMENTED");
 }
 
@@ -322,37 +347,3 @@ void OS_Haiku::get_fullscreen_mode_list(List<VideoMode> *p_list, int p_screen) c
 String OS_Haiku::get_executable_path() const {
 	return OS::get_executable_path();
 }
-
-bool OS_Haiku::_check_internal_feature_support(const String &p_feature) {
-	return p_feature == "pc";
-}
-
-String OS_Haiku::get_config_path() const {
-	if (has_environment("XDG_CONFIG_HOME")) {
-		return get_environment("XDG_CONFIG_HOME");
-	} else if (has_environment("HOME")) {
-		return get_environment("HOME").plus_file("config/settings");
-	} else {
-		return ".";
-	}
-}
-
-String OS_Haiku::get_data_path() const {
-	if (has_environment("XDG_DATA_HOME")) {
-		return get_environment("XDG_DATA_HOME");
-	} else if (has_environment("HOME")) {
-		return get_environment("HOME").plus_file("config/data");
-	} else {
-		return get_config_path();
-	}
-}
-
-String OS_Haiku::get_cache_path() const {
-	if (has_environment("XDG_CACHE_HOME")) {
-		return get_environment("XDG_CACHE_HOME");
-	} else if (has_environment("HOME")) {
-		return get_environment("HOME").plus_file("config/cache");
-	} else {
-		return get_config_path();
-	}
-}

os_haiku.h

@@ -3,10 +3,9 @@
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
+/*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2017 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       */
@@ -27,78 +26,89 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-
 #ifndef OS_HAIKU_H
 #define OS_HAIKU_H
 
+#include "drivers/unix/os_unix.h"
+#include "servers/visual_server.h"
+#include "servers/visual/rasterizer.h"
+#include "servers/physics_server.h"
+#include "servers/physics_2d/physics_2d_server_sw.h"
+#include "servers/audio/audio_server_sw.h"
+#include "servers/audio/sample_manager_sw.h"
+#include "servers/spatial_sound/spatial_sound_server_sw.h"
+#include "servers/spatial_sound_2d/spatial_sound_2d_server_sw.h"
+#include "main/input_default.h"
+
 #include "audio_driver_media_kit.h"
 #include "context_gl_haiku.h"
-#include "core/input/input.h"
-#include "drivers/unix/os_unix.h"
 #include "haiku_application.h"
 #include "haiku_direct_window.h"
-#include "servers/audio_server.h"
-#include "servers/rendering_server.h"
+
 
 class OS_Haiku : public OS_Unix {
 private:
-	HaikuApplication *app;
-	HaikuDirectWindow *window;
-	MainLoop *main_loop;
-	InputDefault *input;
-	RenderingServer *rendering_server;
+	HaikuApplication* app;
+	HaikuDirectWindow* window;
+	MainLoop* main_loop;
+	InputDefault* input;
+	Rasterizer* rasterizer;
+	VisualServer* visual_server;
 	VideoMode current_video_mode;
-	int video_driver_index;
+	PhysicsServer* physics_server;
+	Physics2DServer* physics_2d_server;
+	AudioServerSW* audio_server;
+	SampleManagerMallocSW* sample_manager;
+	SpatialSoundServerSW* spatial_sound_server;
+	SpatialSound2DServerSW* spatial_sound_2d_server;
 
 #ifdef MEDIA_KIT_ENABLED
 	AudioDriverMediaKit driver_media_kit;
 #endif
 
-#if defined(OPENGL_ENABLED)
-	ContextGL_Haiku *context_gl;
+#if defined(OPENGL_ENABLED) || defined(LEGACYGL_ENABLED)
+	ContextGL_Haiku* context_gl;
 #endif
 
 	virtual void delete_main_loop();
 
 protected:
 	virtual int get_video_driver_count() const;
-	virtual const char *get_video_driver_name(int p_driver) const;
-	virtual int get_current_video_driver() const;
+	virtual const char* get_video_driver_name(int p_driver) const;
+	virtual VideoMode get_default_video_mode() const;
 
-	virtual Error initialize(const VideoMode &p_desired, int p_video_driver, int p_audio_driver);
+	virtual void initialize(const VideoMode& p_desired, int p_video_driver, int p_audio_driver);
 	virtual void finalize();
 
-	virtual void set_main_loop(MainLoop *p_main_loop);
+	virtual void set_main_loop(MainLoop* p_main_loop);
 
 public:
 	OS_Haiku();
 	void run();
 
-	virtual String get_name() const;
+	virtual String get_name();
 
-	virtual MainLoop *get_main_loop() const;
+	virtual MainLoop* get_main_loop() const;
 
 	virtual bool can_draw() const;
 	virtual void release_rendering_thread();
 	virtual void make_rendering_thread();
 	virtual void swap_buffers();
 
-	virtual Point2 get_mouse_position() const;
+	virtual Point2 get_mouse_pos() const;
 	virtual int get_mouse_button_state() const;
 	virtual void set_cursor_shape(CursorShape p_shape);
-	virtual CursorShape get_cursor_shape() const;
-	virtual void set_custom_mouse_cursor(const RES &p_cursor, CursorShape p_shape, const Vector2 &p_hotspot);
 
 	virtual int get_screen_count() const;
 	virtual int get_current_screen() const;
 	virtual void set_current_screen(int p_screen);
-	virtual Point2 get_screen_position(int p_screen = -1) const;
-	virtual Size2 get_screen_size(int p_screen = -1) const;
-	virtual void set_window_title(const String &p_title);
+	virtual Point2 get_screen_position(int p_screen=0) const;
+	virtual Size2 get_screen_size(int p_screen=0) const;
+	virtual void set_window_title(const String& p_title);
 	virtual Size2 get_window_size() const;
 	virtual void set_window_size(const Size2 p_size);
 	virtual Point2 get_window_position() const;
-	virtual void set_window_position(const Point2 &p_position);
+	virtual void set_window_position(const Point2& p_position);
 	virtual void set_window_fullscreen(bool p_enabled);
 	virtual bool is_window_fullscreen() const;
 	virtual void set_window_resizable(bool p_enabled);
@@ -108,16 +118,10 @@ public:
 	virtual void set_window_maximized(bool p_enabled);
 	virtual bool is_window_maximized() const;
 
-	virtual void set_video_mode(const VideoMode &p_video_mode, int p_screen = 0);
-	virtual VideoMode get_video_mode(int p_screen = 0) const;
-	virtual void get_fullscreen_mode_list(List<VideoMode> *p_list, int p_screen = 0) const;
+	virtual void set_video_mode(const VideoMode& p_video_mode, int p_screen=0);
+	virtual VideoMode get_video_mode(int p_screen=0) const;
+	virtual void get_fullscreen_mode_list(List<VideoMode> *p_list, int p_screen=0) const;
 	virtual String get_executable_path() const;
-
-	virtual bool _check_internal_feature_support(const String &p_feature);
-
-	virtual String get_config_path() const;
-	virtual String get_data_path() const;
-	virtual String get_cache_path() const;
 };
 
 #endif

platform_config.h

@@ -3,10 +3,9 @@
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
+/*                    http://www.godotengine.org                         */
 /*************************************************************************/
-/* Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2020 Godot Engine contributors (cf. AUTHORS.md).   */
+/* Copyright (c) 2007-2017 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       */
@@ -27,10 +26,9 @@
 /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE     */
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
-
 #include <alloca.h>
 
 // for ifaddrs.h needed in drivers/unix/ip_unix.cpp
 #define _BSD_SOURCE 1
 
-#define GLES2_INCLUDE_H "thirdparty/glad/glad/glad.h"
+#define GLES2_INCLUDE_H <GL/glew.h>