Skip to content

Replaced function pointer callbacks with function objects #387

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

Open
LukasWikander wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replaced function pointer callbacks with function objects #387

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion EnvironmentSimulator/Libraries/esminiLib/esminiLib.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ static void resetScenario(void)

// Reset (global) callbacks
OSCCondition::conditionCallback = nullptr;
StoryBoardElement::stateChangeCallback = nullptr;
StoryBoardElement::stateChangeCallback = {};

time_stamp = 0;
}
Expand Down Expand Up @@ -462,6 +462,11 @@ static int InitScenario()
return 0;
}

SE_DLL_API void SE_RegisterStoryBoardElementStateChangeCallback(std::function<void(const char*, int, int)> fn)
{
StoryBoardElement::stateChangeCallback = fn;
}

extern "C"
{
SE_DLL_API int SE_AddPath(const char *path)
Expand Down
5 changes: 5 additions & 0 deletions EnvironmentSimulator/Libraries/esminiLib/esminiLib.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1437,3 +1437,8 @@ extern "C"
#ifdef __cplusplus
}
#endif

#ifdef __cplusplus
#include <functional>
SE_DLL_API void SE_RegisterStoryBoardElementStateChangeCallback(std::function<void(const char*, int, int)> fn);
#endif
2 changes: 1 addition & 1 deletion EnvironmentSimulator/Modules/ScenarioEngine/OSCTypeDefs/OSCAction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

using namespace scenarioengine;

void (*StoryBoardElement::stateChangeCallback)(const char* name, int type, int state) = nullptr;
std::function<void(const char* name, int type, int state)> StoryBoardElement::stateChangeCallback = nullptr;

std::string StoryBoardElement::state2str(StoryBoardElement::State state)
{
Expand Down
7 changes: 4 additions & 3 deletions EnvironmentSimulator/Modules/ScenarioEngine/OSCTypeDefs/OSCAction.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,17 @@
#pragma once

#include "Entities.hpp"
#include <functional>

namespace scenarioengine
{

class StoryBoardElement
{
public:
static void (*stateChangeCallback)(const char* name, int type, int state);

/**
static std::function<void(const char* name, int type, int state)> stateChangeCallback;
/**
* Take note, changing this enum will alter the public API in esminiLib.hpp
*/
typedef enum
Expand Down