hertog/godot-module-template
Template
2
1
Fork 1
Code Issues 2 Pull requests 2 Projects Releases Packages Wiki Activity Actions

feat: modules moved and engine moved to submodule

Browse source
This commit is contained in:
Jan van der Weide 2025-04-12 18:40:44 +02:00
parent dfb5e645cd
commit c33d2130cc
5136 changed files with 225275 additions and 64485 deletions
Download patch file Download diff file Expand all files Collapse all files

18
engine/modules/interactive_music/audio_stream_interactive.cpp
View file

@ -123,9 +123,9 @@ void AudioStreamInteractive::set_clip_stream(int p_clip, const Ref<AudioStream>
if (clips[p_clip].name == StringName() && p_stream.is_valid()) {
String n;
if (!clips[p_clip].stream->get_name().is_empty()) {
n = clips[p_clip].stream->get_name().replace(",", " ");
n = clips[p_clip].stream->get_name().replace_char(',', ' ');
} else if (clips[p_clip].stream->get_path().is_resource_file()) {
n = clips[p_clip].stream->get_path().get_file().get_basename().replace(",", " ");
n = clips[p_clip].stream->get_path().get_file().get_basename().replace_char(',', ' ');
n = n.capitalize();
}
@ -173,11 +173,9 @@ int AudioStreamInteractive::get_clip_auto_advance_next_clip(int p_clip) const {
// TRANSITIONS
void AudioStreamInteractive::_set_transitions(const Dictionary &p_transitions) {
List<Variant> keys;
p_transitions.get_key_list(&keys);
for (const Variant &K : keys) {
Vector2i k = K;
Dictionary data = p_transitions[K];
for (const KeyValue<Variant, Variant> &kv : p_transitions) {
Vector2i k = kv.key;
Dictionary data = kv.value;
ERR_CONTINUE(!data.has("from_time"));
ERR_CONTINUE(!data.has("to_time"));
ERR_CONTINUE(!data.has("fade_mode"));
@ -397,13 +395,13 @@ String AudioStreamInteractive::_get_streams_hint() const {
if (i > 0) {
stream_name_cache += ",";
}
String n = String(clips[i].name).replace(",", " ");
String n = String(clips[i].name).replace_char(',', ' ');
if (n == "" && clips[i].stream.is_valid()) {
if (!clips[i].stream->get_name().is_empty()) {
n = clips[i].stream->get_name().replace(",", " ");
n = clips[i].stream->get_name().replace_char(',', ' ');
} else if (clips[i].stream->get_path().is_resource_file()) {
n = clips[i].stream->get_path().get_file().replace(",", " ");
n = clips[i].stream->get_path().get_file().replace_char(',', ' ');
}
}

7
engine/modules/interactive_music/audio_stream_interactive.h
View file

@ -28,8 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef AUDIO_STREAM_INTERACTIVE_H
#define AUDIO_STREAM_INTERACTIVE_H
#pragma once
#include "servers/audio/audio_stream.h"
@ -183,6 +182,8 @@ public:
virtual Ref<AudioStreamPlayback> instantiate_playback() override;
virtual String get_stream_name() const override;
virtual double get_length() const override { return 0; }
virtual bool is_meta_stream() const override { return true; }
AudioStreamInteractive();
protected:
@ -267,5 +268,3 @@ public:
AudioStreamPlaybackInteractive();
~AudioStreamPlaybackInteractive();
};
#endif // AUDIO_STREAM_INTERACTIVE_H

6
engine/modules/interactive_music/audio_stream_playlist.h
View file

@ -28,8 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef AUDIO_STREAM_PLAYLIST_H
#define AUDIO_STREAM_PLAYLIST_H
#pragma once
#include "servers/audio/audio_stream.h"
@ -70,6 +69,7 @@ public:
virtual Ref<AudioStreamPlayback> instantiate_playback() override;
virtual String get_stream_name() const override;
virtual double get_length() const override;
virtual bool is_meta_stream() const override { return true; }
protected:
static void _bind_methods();
@ -121,5 +121,3 @@ public:
~AudioStreamPlaybackPlaylist();
};
#endif // AUDIO_STREAM_PLAYLIST_H

7
engine/modules/interactive_music/audio_stream_synchronized.h
View file

@ -28,8 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef AUDIO_STREAM_SYNCHRONIZED_H
#define AUDIO_STREAM_SYNCHRONIZED_H
#pragma once
#include "servers/audio/audio_stream.h"
@ -66,6 +65,8 @@ public:
virtual Ref<AudioStreamPlayback> instantiate_playback() override;
virtual String get_stream_name() const override;
virtual double get_length() const override;
virtual bool is_meta_stream() const override { return true; }
AudioStreamSynchronized();
protected:
@ -116,5 +117,3 @@ public:
AudioStreamPlaybackSynchronized();
~AudioStreamPlaybackSynchronized();
};
#endif // AUDIO_STREAM_SYNCHRONIZED_H

9
engine/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.cpp
View file

@ -115,7 +115,7 @@ void AudioStreamInteractiveTransitionEditor::_update_selection() {
filler_clip->set_disabled(selected.is_empty());
hold_previous->set_disabled(selected.is_empty());
if (selected.size() == 0) {
if (selected.is_empty()) {
return;
}
@ -341,6 +341,7 @@ AudioStreamInteractiveTransitionEditor::AudioStreamInteractiveTransitionEditor()
transition_enabled = memnew(CheckBox);
transition_enabled->set_text(TTR("Enabled"));
transition_enabled->set_accessibility_name(TTRC("Use Transition"));
edit_vb->add_margin_child(TTR("Use Transition:"), transition_enabled);
transition_enabled->connect(SceneStringName(pressed), callable_mp(this, &AudioStreamInteractiveTransitionEditor::_edited));
@ -350,6 +351,7 @@ AudioStreamInteractiveTransitionEditor::AudioStreamInteractiveTransitionEditor()
transition_from->add_item(TTR("Next Beat"), AudioStreamInteractive::TRANSITION_FROM_TIME_NEXT_BEAT);
transition_from->add_item(TTR("Next Bar"), AudioStreamInteractive::TRANSITION_FROM_TIME_NEXT_BAR);
transition_from->add_item(TTR("Clip End"), AudioStreamInteractive::TRANSITION_FROM_TIME_END);
transition_from->set_accessibility_name(TTRC("Transition From"));
transition_from->connect(SceneStringName(item_selected), callable_mp(this, &AudioStreamInteractiveTransitionEditor::_edited).unbind(1));
@ -358,25 +360,30 @@ AudioStreamInteractiveTransitionEditor::AudioStreamInteractiveTransitionEditor()
transition_to->add_item(TTR("Same Position"), AudioStreamInteractive::TRANSITION_TO_TIME_SAME_POSITION);
transition_to->add_item(TTR("Clip Start"), AudioStreamInteractive::TRANSITION_TO_TIME_START);
transition_to->add_item(TTR("Prev Position"), AudioStreamInteractive::TRANSITION_TO_TIME_PREVIOUS_POSITION);
transition_to->set_accessibility_name(TTRC("Transition To"));
transition_to->connect(SceneStringName(item_selected), callable_mp(this, &AudioStreamInteractiveTransitionEditor::_edited).unbind(1));
fade_mode = memnew(OptionButton);
edit_vb->add_margin_child(TTR("Fade Mode:"), fade_mode);
fade_mode->connect(SceneStringName(item_selected), callable_mp(this, &AudioStreamInteractiveTransitionEditor::_edited).unbind(1));
fade_mode->set_accessibility_name(TTRC("Fade Mode"));
fade_beats = memnew(SpinBox);
edit_vb->add_margin_child(TTR("Fade Beats:"), fade_beats);
fade_beats->set_max(16);
fade_beats->set_step(0.1);
fade_beats->connect(SceneStringName(value_changed), callable_mp(this, &AudioStreamInteractiveTransitionEditor::_edited).unbind(1));
fade_beats->set_accessibility_name(TTRC("Fade Beats"));
filler_clip = memnew(OptionButton);
edit_vb->add_margin_child(TTR("Filler Clip:"), filler_clip);
filler_clip->set_auto_translate_mode(AUTO_TRANSLATE_MODE_DISABLED);
filler_clip->connect(SceneStringName(item_selected), callable_mp(this, &AudioStreamInteractiveTransitionEditor::_edited).unbind(1));
filler_clip->set_accessibility_name(TTRC("Filler Clip"));
hold_previous = memnew(CheckBox);
hold_previous->set_text(TTR("Enabled"));
hold_previous->set_accessibility_name(TTRC("Hold Previous"));
hold_previous->connect(SceneStringName(pressed), callable_mp(this, &AudioStreamInteractiveTransitionEditor::_edited));
edit_vb->add_margin_child(TTR("Hold Previous:"), hold_previous);

5
engine/modules/interactive_music/editor/audio_stream_interactive_editor_plugin.h
View file

@ -28,8 +28,7 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef AUDIO_STREAM_INTERACTIVE_EDITOR_PLUGIN_H
#define AUDIO_STREAM_INTERACTIVE_EDITOR_PLUGIN_H
#pragma once
#include "editor/editor_inspector.h"
#include "editor/plugins/editor_plugin.h"
@ -106,5 +105,3 @@ public:
AudioStreamInteractiveEditorPlugin();
};
#endif // AUDIO_STREAM_INTERACTIVE_EDITOR_PLUGIN_H

5
engine/modules/interactive_music/register_types.h
View file

@ -28,12 +28,9 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/**************************************************************************/
#ifndef INTERACTIVE_MUSIC_REGISTER_TYPES_H
#define INTERACTIVE_MUSIC_REGISTER_TYPES_H
#pragma once
#include "modules/register_module_types.h"
void initialize_interactive_music_module(ModuleInitializationLevel p_level);
void uninitialize_interactive_music_module(ModuleInitializationLevel p_level);
#endif // INTERACTIVE_MUSIC_REGISTER_TYPES_H