aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/crepe/ComponentManager.hpp1
-rw-r--r--src/crepe/ScriptSystem.cpp11
-rw-r--r--src/crepe/api/BehaviorScript.h1
-rw-r--r--src/crepe/util/CMakeLists.txt2
-rw-r--r--src/crepe/util/fmt.cpp34
-rw-r--r--src/crepe/util/fmt.h10
-rw-r--r--src/crepe/util/log.cpp27
-rw-r--r--src/crepe/util/log.h2
-rw-r--r--src/example/script.cpp3
9 files changed, 71 insertions, 20 deletions
diff --git a/src/crepe/ComponentManager.hpp b/src/crepe/ComponentManager.hpp
index 8fc1cba..c872594 100644
--- a/src/crepe/ComponentManager.hpp
+++ b/src/crepe/ComponentManager.hpp
@@ -3,6 +3,7 @@
#include <type_traits>
#include "ComponentManager.h"
+#include "api/BehaviorScript.h"
namespace crepe {
diff --git a/src/crepe/ScriptSystem.cpp b/src/crepe/ScriptSystem.cpp
index e301c71..e40909e 100644
--- a/src/crepe/ScriptSystem.cpp
+++ b/src/crepe/ScriptSystem.cpp
@@ -1,3 +1,7 @@
+#include <vector>
+#include "ComponentManager.h"
+#include "api/BehaviorScript.h"
+#include "util/fmt.h"
#include "util/log.h"
#include "ScriptSystem.h"
@@ -17,6 +21,13 @@ ScriptSystem & ScriptSystem::get_instance() {
}
void ScriptSystem::update() {
+ using namespace std;
dbg_trace();
+
+ ComponentManager & mgr = ComponentManager::get_instance();
+ vector<reference_wrapper<api::BehaviorScript>> scripts = mgr.get_components_by_type<api::BehaviorScript>();
+
+ dbg_logf("script count: %lu", scripts.size());
+
}
diff --git a/src/crepe/api/BehaviorScript.h b/src/crepe/api/BehaviorScript.h
index ba60a8c..dd04dc0 100644
--- a/src/crepe/api/BehaviorScript.h
+++ b/src/crepe/api/BehaviorScript.h
@@ -14,6 +14,7 @@ public:
// but allow uniqe_ptr to call the destructor (THIS IS VERY IMPORTANT)
virtual ~BehaviorScript() = default;
+ static BehaviorScript * component;
};
}
diff --git a/src/crepe/util/CMakeLists.txt b/src/crepe/util/CMakeLists.txt
index 100f028..e2cffaf 100644
--- a/src/crepe/util/CMakeLists.txt
+++ b/src/crepe/util/CMakeLists.txt
@@ -1,9 +1,11 @@
target_sources(crepe PUBLIC
log.cpp
+ fmt.cpp
)
target_sources(crepe PUBLIC FILE_SET HEADERS FILES
color.h
log.h
+ fmt.h
)
diff --git a/src/crepe/util/fmt.cpp b/src/crepe/util/fmt.cpp
new file mode 100644
index 0000000..3a43a6f
--- /dev/null
+++ b/src/crepe/util/fmt.cpp
@@ -0,0 +1,34 @@
+#include <string>
+#include <cstdio>
+#include <cstdarg>
+
+#include "fmt.h"
+
+using namespace std;
+
+string crepe::util::va_stringf(va_list args, const char * fmt) {
+ va_list args_copy;
+ va_copy(args_copy, args);
+
+ size_t sz = vsnprintf(NULL, 0, fmt, args_copy) + 1;
+ char * msg = (char *) malloc(sz);
+ va_end(args_copy);
+
+ vsnprintf(msg, sz, fmt, args);
+
+ string out = msg;
+ free(msg);
+
+ va_end(args);
+
+ return out;
+}
+
+string crepe::util::stringf(const char * fmt, ...) {
+ va_list args;
+ va_start(args, fmt);
+ string out = va_stringf(args, fmt);
+ va_end(args);
+ return out;
+}
+
diff --git a/src/crepe/util/fmt.h b/src/crepe/util/fmt.h
new file mode 100644
index 0000000..5c45703
--- /dev/null
+++ b/src/crepe/util/fmt.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include <string>
+
+namespace crepe::util {
+
+std::string va_stringf(va_list args, const char * fmt);
+std::string stringf(const char * fmt, ...);
+
+}
diff --git a/src/crepe/util/log.cpp b/src/crepe/util/log.cpp
index f91d52c..b46620d 100644
--- a/src/crepe/util/log.cpp
+++ b/src/crepe/util/log.cpp
@@ -4,6 +4,7 @@
#include <string>
#include "log.h"
+#include "fmt.h"
using namespace crepe::util;
@@ -14,37 +15,27 @@ static const char * const LOG_PREFIX[] = {
[log_level::ERROR] = "[ERR] ",
};
-static void va_logf(enum log_level level, va_list args, const std::string fmt) {
- va_list args_copy;
- va_copy(args_copy, args);
-
- // prepend log level and ensure newline
- std::string format_fixed = LOG_PREFIX[level] + fmt;
- if (!format_fixed.ends_with("\n")) format_fixed += "\n";
-
- size_t sz = vsnprintf(NULL, 0, format_fixed.c_str(), args_copy) + 1;
- char * msg = (char *) malloc(sz);
- va_end(args_copy);
-
- vsnprintf(msg, sz, format_fixed.c_str(), args);
+static void log(enum log_level level, const std::string msg) {
+ using namespace std;
+ string final = string(LOG_PREFIX[level]) + msg;
+ if (!final.ends_with("\n")) final += "\n";
// TODO: also log to file or smth
- printf("%s", msg);
+ printf("%s", final.c_str());
fflush(stdout);
-
- free(msg);
}
void crepe::util::logf(const char * fmt, ...) {
va_list args;
va_start(args, fmt);
- va_logf(crepe::util::log_level::DEBUG, args, fmt);
+ log(log_level::DEBUG, va_stringf(args, fmt));
va_end(args);
}
void crepe::util::logf(log_level level, const char * fmt, ...) {
va_list args;
va_start(args, fmt);
- va_logf(level, args, fmt);
+ log(level, va_stringf(args, fmt));
va_end(args);
}
+
diff --git a/src/crepe/util/log.h b/src/crepe/util/log.h
index fa5f633..3e36f0a 100644
--- a/src/crepe/util/log.h
+++ b/src/crepe/util/log.h
@@ -7,7 +7,7 @@
// utility macros
#define _crepe_logf_here(fmt, ...) \
- crepe::util::logf(util::log_level::DEBUG, "%s%s (%s:%d)" fmt "\n", \
+ crepe::util::logf(util::log_level::DEBUG, "%s%s (%s:%d)%s" fmt "\n", \
crepe::util::color::FG_WHITE, __PRETTY_FUNCTION__, \
__FILE_NAME__, __LINE__, crepe::util::color::RESET, \
__VA_ARGS__)
diff --git a/src/example/script.cpp b/src/example/script.cpp
index 28605c7..b8b3c8d 100644
--- a/src/example/script.cpp
+++ b/src/example/script.cpp
@@ -11,9 +11,10 @@
#include <crepe/api/BehaviorScript.h>
using namespace crepe;
+using namespace crepe::api;
using namespace std;
-class MyScript : public api::BehaviorScript {
+class MyScript : public BehaviorScript {
void update() {
dbg_trace();
}