Skip to content

DRAFT: Implement C++ Solutions for Algorithms #1208

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Schweini07 wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

DRAFT: Implement C++ Solutions for Algorithms #1208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
594b75c
Initial Commit
Schweini07 Mar 29, 2025
11f8e6d
Move gdextension directory fully to root
Schweini07 Mar 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[submodule "gdextension/godot-cpp"]
path = gdextension/godot-cpp
url = https://github.com/godotengine/godot-cpp
33 changes: 33 additions & 0 deletions gdextension/SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
#!/usr/bin/env python
import os
import sys

env = SConscript("godot-cpp/SConstruct")

# For reference:
# - CCFLAGS are compilation flags shared between C and C++
# - CFLAGS are for C-specific compilation flags
# - CXXFLAGS are for C++-specific compilation flags
# - CPPFLAGS are for pre-processor flags
# - CPPDEFINES are for pre-processor defines
# - LINKFLAGS are for linking flags

# tweak this if you want to use different folders, or more folders, to store your source code in.
env.Append(CPPPATH=["src"])
sources = Glob("src/*.cpp")
sources += Glob("src/algorithms/*.cpp")

if env["platform"] == "macos":
library = env.SharedLibrary(
"lib/bin/pixelorama_lib.{}.{}.framework/pixelorama_lib.{}.{}".format(
env["platform"], env["target"], env["platform"], env["target"]
),
source=sources,
)
else:
library = env.SharedLibrary(
"lib/bin/pixelorama_lib{}{}".format(env["suffix"], env["SHLIBSUFFIX"]),
source=sources,
)

Default(library)
1 change: 1 addition & 0 deletions gdextension/godot-cpp
Open in desktop
Submodule godot-cpp added at f088bc
87 changes: 87 additions & 0 deletions gdextension/src/algorithms/drawing_algos.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
#include "drawing_algos.hpp"

#include <godot_cpp/variant/utility_functions.hpp>

void DrawingAlgosCpp::_bind_methods()
{
godot::ClassDB::bind_method(godot::D_METHOD("get_ellipse_points", "pos", "size"), &DrawingAlgosCpp::GetEllipsePoints);
}

DrawingAlgosCpp::DrawingAlgosCpp()
{
}

godot::Array DrawingAlgosCpp::GetEllipsePoints(godot::Vector2i pos, godot::Vector2i size)
{
godot::Array array;
int x0 = pos.x;
int x1 = pos.x + (size.x - 1);
int y0 = pos.y;
int y1 = pos.y + (size.y - 1);
int a = godot::UtilityFunctions::absi(x1 - x0);
int b = godot::UtilityFunctions::absi(y1 - y0);
int b1 = b & 1;
int dx = 4 * (1 - a) * b * b;
int dy = 4 * (b1 + 1) * a * a;
int err = dx + dy + b1 * a * a;
int e2 = 0;

if (x0 > x1)
{
x0 = x1;
x1 += a;
}

if (y0 > y1)
y0 = y1;

y0 += (b + 1) / 2;
y1 = y0 - b1;
a *= 8 * a;
b1 = 8 * b * b;

while (x0 <= x1)
{
godot::Vector2i v1 = godot::Vector2i(x1, y0);
godot::Vector2i v2 = godot::Vector2i(x0, y0);
godot::Vector2i v3 = godot::Vector2i(x0, y1);
godot::Vector2i v4 = godot::Vector2i(x1, y1);
array.append(v1);
array.append(v2);
array.append(v3);
array.append(v4);

e2 = 2 * err;
if (e2 <= dy)
{
y0 += 1;
y1 -= 1;
dy += a;
err += dy;
}

if (e2 >= dx || 2 * err > dy)
{
x0 += 1;
x1 -= 1;
dx += b1;
err += dx;
}
}

while (y0 - y1 < b)
{
godot::Vector2i v1 = godot::Vector2i(x0 - 1, y0);
godot::Vector2i v2 = godot::Vector2i(x1 + 1, y0);
godot::Vector2i v3 = godot::Vector2i(x0 - 1, y1);
godot::Vector2i v4 = godot::Vector2i(x1 + 1, y1);
array.append(v1);
array.append(v2);
array.append(v3);
array.append(v4);
y0 += 1;
y1 -= 1;
}

return array;
}
20 changes: 20 additions & 0 deletions gdextension/src/algorithms/drawing_algos.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#pragma once

#include <godot_cpp/classes/node.hpp>
#include <godot_cpp/variant/array.hpp>
#include <godot_cpp/variant/vector2i.hpp>
#include <godot_cpp/classes/ref_counted.hpp>

class DrawingAlgosCpp : public godot::Node
{
GDCLASS(DrawingAlgosCpp, Node)

public:
DrawingAlgosCpp();
~DrawingAlgosCpp() = default;

godot::Array GetEllipsePoints(godot::Vector2i pos, godot::Vector2i size);

protected:
static void _bind_methods();
};
36 changes: 36 additions & 0 deletions gdextension/src/register_types.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#include "register_types.hpp"

#include "algorithms/bucket.hpp"
#include "algorithms/drawing_algos.hpp"

#include <gdextension_interface.h>
#include <godot_cpp/core/defs.hpp>
#include <godot_cpp/godot.hpp>

void initialize_pixelorama_lib(godot::ModuleInitializationLevel p_level)
{
if (p_level != godot::MODULE_INITIALIZATION_LEVEL_SCENE)
return;

godot::ClassDB::register_class<DrawingAlgosCpp>();
}

void uninitialize_pixelorama_lib(godot::ModuleInitializationLevel p_level)
{
if (p_level != godot::MODULE_INITIALIZATION_LEVEL_SCENE)
return;
}

extern "C"
{
GDExtensionBool GDE_EXPORT pixelorama_lib_init(GDExtensionInterfaceGetProcAddress p_get_proc_address, const GDExtensionClassLibraryPtr p_library, GDExtensionInitialization *r_initialization)
{
godot::GDExtensionBinding::InitObject init_obj(p_get_proc_address, p_library, r_initialization);

init_obj.register_initializer(initialize_pixelorama_lib);
init_obj.register_terminator(uninitialize_pixelorama_lib);
init_obj.set_minimum_library_initialization_level(godot::MODULE_INITIALIZATION_LEVEL_SCENE);

return init_obj.init();
}
}
6 changes: 6 additions & 0 deletions gdextension/src/register_types.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#pragma once

#include <godot_cpp/core/class_db.hpp>

void initialize_pixelorama_lib(godot::ModuleInitializationLevel p_level);
void uninitialize_pixelorama_lib(godot::ModuleInitializationLevel p_level);
34 changes: 34 additions & 0 deletions pixeloramalib.gdextension
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[configuration]

entry_symbol = "pixelorama_lib_init"
compatibility_minimum = "4.1"
reloadable = true

[libraries]

macos.debug = "res://gdextension/lib/bin/libpixelorama.macos.template_debug.framework"
macos.release = "res://gdextension/lib/bin/libpixelorama.macos.template_release.framework"
ios.debug = "res://gdextension/lib/bin/libpixelorama.ios.template_debug.xcframework"
ios.release = "res://gdextension/lib/bin/libpixelorama.ios.template^_release.xcframework"
windows.debug.x86_32 = "res://gdextension/lib/bin/libpixelorama.windows.template_debug.x86_32.dll"
windows.release.x86_32 = "res://gdextension/lib/bin/libpixelorama.windows.template_release.x86_32.dll"
windows.debug.x86_64 = "res://gdextension/lib/bin/libpixelorama.windows.template_debug.x86_64.dll"
windows.release.x86_64 = "res://gdextension/lib/bin/libpixelorama.windows.template_release.x86_64.dll"
linux.debug.x86_64 = "res://gdextension/lib/bin/libpixelorama_lib.linux.template_debug.x86_64.so"
linux.release.x86_64 = "res://gdextension/lib/bin/libpixelorama.linux.template_release.x86_64.so"
linux.debug.arm64 = "res://gdextension/lib/bin/libpixelorama.linux.template_debug.arm64.so"
linux.release.arm64 = "res://gdextension/lib/bin/libpixelorama.linux.template_release.arm64.so"
linux.debug.rv64 = "res://gdextension/lib/bin/libpixelorama.linux.template_debug.rv64.so"
linux.release.rv64 = "res://gdextension/lib/bin/libpixelorama.linux.template_release.rv64.so"
android.debug.x86_64 = "res://gdextension/lib/bin/libpixelorama.android.template_debug.x86_64.so"
android.release.x86_64 = "res://gdextension/lib/bin/libpixelorama.android.template_release.x86_64.so"
android.debug.arm64 = "res://gdextension/lib/bin/libpixelorama.android.template_debug.arm64.so"
android.release.arm64 = "res://gdextension/lib/bin/libpixelorama.android.template_release.arm64.so"

[dependencies]
ios.debug = {
"res://gdextension/lib/bin/libgodot-cpp.ios.template_debug.xcframework": ""
}
ios.release = {
"res://gdextension/lib/bin/libgodot-cpp.ios.template_release.xcframework": ""
}
1 change: 1 addition & 0 deletions pixeloramalib.gdextension.uid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://n1mcj5hu1b26
1 change: 1 addition & 0 deletions project.godot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ Palettes="*res://src/Autoload/Palettes.gd"
Keychain="*res://addons/keychain/Keychain.gd"
ExtensionsApi="*res://src/Autoload/ExtensionsApi.gd"
Themes="*res://src/Autoload/Themes.gd"
DrawingAlgosCppAutoload="*res://src/Autoload/DrawingAlgosCppAutoload.gd"

[debug]

Expand Down
6 changes: 6 additions & 0 deletions src/Autoload/DrawingAlgosCppAutoload.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
extends Node

var algo : DrawingAlgosCpp

func _ready() -> void:
algo = DrawingAlgosCpp.new()
1 change: 1 addition & 0 deletions src/Autoload/DrawingAlgosCppAutoload.gd.uid
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
uid://dm0h5nxjxy5wt
5 changes: 4 additions & 1 deletion src/Tools/SelectionTools/EllipseSelect.gd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,10 @@ func draw_preview() -> void:
if !_move && _rect.has_area():
var temp_rect := _rect

var points := DrawingAlgos.get_ellipse_points(Vector2.ZERO, temp_rect.size)
var points_untyped := DrawingAlgosCppAutoload.algo.get_ellipse_points(Vector2.ZERO, temp_rect.size)
# necessary conversion from an untyped Array to a Vector2i Array as godot-cpp does not support that type
var points : Array[Vector2i]
points.assign(points_untyped)
var image := Image.create(
Global.current_project.size.x, Global.current_project.size.y, false, Image.FORMAT_LA8
)
Expand Down
Loading