Skip to content

Commit 8d3686f

Browse files
committed
Updated Godot plugin.
1 parent 53bcf0f commit 8d3686f

File tree

11 files changed

+46
-19
lines changed

11 files changed

+46
-19
lines changed

GodotPlugin/.clang-format

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
AllowShortBlocksOnASingleLine: Never
2+
BreakBeforeBraces: Allman
3+
IndentWidth: 4
4+
PointerAlignment: Right
5+
TabWidth: 4
6+
UseTab: Never

GodotPlugin/.clang-tidy

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
Checks: 'performance-*,modernize-*,readability-*,-readability-identifier-length'
2+
CheckOptions:
3+
UnusedIncludes: Strict

GodotPlugin/.clangd

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
CompileFlags:
2+
Add:
3+
- '-std=c++17'
4+
- '-Iinclude'
5+
- '-I../include'
6+
- '-Igodot-cpp/gdextension'
7+
- '-Igodot-cpp/gen/include'
8+
- '-Igodot-cpp/include'
9+
Diagnostics:
10+
UnusedIncludes: Strict
11+
ClangTidy:
12+
Add: [performance-*, modernize-*, readability-*]
13+
Remove: [readability-identifier-length]

GodotPlugin/.gitignore

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
addons/
22

3-
*.os
4-
*.dblite
3+
.scons_cache/
4+
5+
.sconsign.dblite
6+
7+
include/*.os

GodotPlugin/compile_flags.txt

Whitespace-only changes.

GodotPlugin/include/register_types.cpp

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#include "register_types.h"
1+
#include "register_types.hpp"
22

3-
#include "rhythm_game_utilities.h"
4-
#include "song.h"
3+
#include "rhythm_game_utilities.hpp"
4+
#include "song.hpp"
55

66
#include <gdextension_interface.h>
77
#include <godot_cpp/core/class_db.hpp>
@@ -21,7 +21,7 @@ void initialize_rhythm_game_utilities(ModuleInitializationLevel p_level)
2121
ClassDB::register_class<Song>();
2222
}
2323

24-
void terminate_rhythm_game_utilities(ModuleInitializationLevel p_level)
24+
void uninitialize_rhythm_game_utilities(ModuleInitializationLevel p_level)
2525
{
2626
if (p_level != MODULE_INITIALIZATION_LEVEL_SCENE)
2727
{
@@ -40,7 +40,10 @@ extern "C"
4040
p_get_proc_address, p_library, r_initialization);
4141

4242
init_obj.register_initializer(initialize_rhythm_game_utilities);
43-
init_obj.register_terminator(terminate_rhythm_game_utilities);
43+
init_obj.register_terminator(uninitialize_rhythm_game_utilities);
44+
45+
init_obj.set_minimum_library_initialization_level(
46+
MODULE_INITIALIZATION_LEVEL_SCENE);
4447

4548
return init_obj.init();
4649
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
#pragma once
22

33
void initialize_rhythm_game_utilities();
4-
void terminate_rhythm_game_utilities();
4+
void uninitialize_rhythm_game_utilities();

GodotPlugin/include/rhythm_game_utilities.cpp

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "rhythm_game_utilities.h"
1+
#include "rhythm_game_utilities.hpp"
22

33
#include "utilities.hpp"
44

@@ -189,18 +189,17 @@ Dictionary rhythm_game_utilities::parse_sections_from_chart(String contents)
189189
auto sections_internal =
190190
RhythmGameUtilities::ParseSectionsFromChart(contents.utf8().get_data());
191191

192-
for (auto section_internal = sections_internal.begin();
193-
section_internal != sections_internal.end(); section_internal++)
192+
for (auto &section_internal : sections_internal)
194193
{
195-
auto section_key = godot::String(section_internal->first.c_str());
194+
auto section_key = godot::String(section_internal.first.c_str());
196195

197196
Array section_items;
198197

199-
for (auto i = 0; i < section_internal->second.size(); i += 1)
198+
for (auto i = 0; i < section_internal.second.size(); i += 1)
200199
{
201200
Dictionary section_item;
202201

203-
auto temp = section_internal->second[i];
202+
auto temp = section_internal.second[i];
204203

205204
auto key = godot::Variant(temp.first.c_str());
206205

GodotPlugin/include/rhythm_game_utilities.h renamed to GodotPlugin/include/rhythm_game_utilities.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class rhythm_game_utilities : public Object
5454
int delta = 50);
5555

5656
static bool is_on_the_beat(int bpm, float current_time,
57-
float delta = 0.05f);
57+
float delta = 0.05F);
5858

5959
static int round_up_to_the_nearest_multiplier(int value, int multiplier);
6060
};

GodotPlugin/include/song.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
#include "song.h"
1+
#include "song.hpp"
22

3-
#include "rhythm_game_utilities.h"
3+
#include "rhythm_game_utilities.hpp"
44

5-
#include <RhythmGameUtilities/Enums/Difficulty.h>
6-
#include <RhythmGameUtilities/Enums/NamedSection.h>
5+
#include <RhythmGameUtilities/Enums/Difficulty.hpp>
6+
#include <RhythmGameUtilities/Enums/NamedSection.hpp>
77

88
void Song::_bind_methods()
99
{

0 commit comments

Comments
 (0)