Skip to content
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

restore legacy event parameter setting #183

Merged
merged 15 commits into from
Dec 18, 2023
Merged

restore legacy event parameter setting #183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8432915
update godot-cpp to 4.2-stable
bitbrain Dec 2, 2023
98bc551
adjust gdextension number
bitbrain Dec 3, 2023
569ccce
fix build
bitbrain Dec 3, 2023
be6e2e8
bump to Godot 4.2
bitbrain Dec 3, 2023
5cad11c
fix ubuntu
bitbrain Dec 3, 2023
599caf8
attempt to fix NDK
bitbrain Dec 3, 2023
a17f630
fix error
bitbrain Dec 3, 2023
8407805
remove whitespace
bitbrain Dec 4, 2023
1ae17b1
update GUT
bitbrain Dec 6, 2023
5440d0c
fix imports
bitbrain Dec 6, 2023
7c8e3ca
update cache
bitbrain Dec 6, 2023
cb48f03
fix script
bitbrain Dec 6, 2023
61a06f6
oopsie doopsie
bitbrain Dec 6, 2023
e29c578
restore legacy event parameter setting
bitbrain Dec 9, 2023
23dc5bd
Merge branch 'master' into restore-legacy-event-parameter
bitbrain Dec 14, 2023
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 .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,3 +134,6 @@ config.log
**/*.editor

demo/addons/fmod/libs/android/aar/

*.pdb
.vs
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

those get generated when using visual studio, so I put them onto ignore

34 changes: 34 additions & 0 deletions src/nodes/fmod_event_emitter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ namespace godot {

void play();
void stop();
Variant get_parameter(const String& p_name) const;
void set_parameter(const String& p_name, const Variant& p_property);
void set_paused(bool p_is_paused);
const Ref<FmodEvent>& get_event() const;
bool is_paused();
Expand Down Expand Up @@ -233,6 +235,36 @@ namespace godot {
}
}

template<class Derived, class NodeType>
Variant FmodEventEmitter<Derived, NodeType>::get_parameter(const String& p_name) const {
if (!_event.is_valid()) { return nullptr; }

Parameter* parameter {find_parameter_by_name(p_name)};

if (!parameter) { return nullptr; }

return parameter->value;
}

template<class Derived, class NodeType>
void FmodEventEmitter<Derived, NodeType>::set_parameter(const String& p_name, const Variant& p_property) {
if (!_event.is_valid()) { return; }

Parameter* parameter {find_parameter_by_name(p_name)};

if (!parameter) { return; }

parameter->value = p_property;

#ifdef TOOLS_ENABLED
if (!Engine::get_singleton()->is_editor_hint()) {
#endif
apply_parameters();
#ifdef TOOLS_ENABLED
}
#endif
}

template<class Derived, class NodeType>
void FmodEventEmitter<Derived, NodeType>::set_paused(bool p_is_paused) {
if (!_event.is_valid()) { return; }
Expand Down Expand Up @@ -696,6 +728,8 @@ namespace godot {
void FmodEventEmitter<Derived, NodeType>::_bind_methods() {
ClassDB::bind_method(D_METHOD("play"), &Derived::play);
ClassDB::bind_method(D_METHOD("stop"), &Derived::stop);
ClassDB::bind_method(D_METHOD("set_parameter", "name", "value"), &Derived::set_parameter);
ClassDB::bind_method(D_METHOD("get_parameter", "name"), &Derived::get_parameter);
ClassDB::bind_method(D_METHOD("is_paused"), &Derived::is_paused);
ClassDB::bind_method(D_METHOD("set_paused", "p_is_paused"), &Derived::set_paused);
ClassDB::bind_method(D_METHOD("set_event_name", "event_name"), &Derived::set_event_name);
Expand Down
Loading