aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/crepe/ScriptSystem.cpp1
-rw-r--r--src/crepe/api/Transform.cpp2
-rw-r--r--src/crepe/api/Transform.h2
-rw-r--r--src/example/audio_internal.cpp27
-rw-r--r--src/example/log.cpp17
-rw-r--r--src/example/script.cpp31
-rw-r--r--src/readme.md8
7 files changed, 60 insertions, 28 deletions
diff --git a/src/crepe/ScriptSystem.cpp b/src/crepe/ScriptSystem.cpp
index d00d474..171b490 100644
--- a/src/crepe/ScriptSystem.cpp
+++ b/src/crepe/ScriptSystem.cpp
@@ -37,6 +37,7 @@ forward_list<Script *> ScriptSystem::get_scripts() {
for (auto behavior_script_ref : behavior_scripts) {
BehaviorScript & behavior_script = behavior_script_ref.get();
+ if (!behavior_script.active) continue;
Script * script = behavior_script.script.get();
if (script == nullptr) continue;
scripts.push_front(script);
diff --git a/src/crepe/api/Transform.cpp b/src/crepe/api/Transform.cpp
index 626cd67..3b218bc 100644
--- a/src/crepe/api/Transform.cpp
+++ b/src/crepe/api/Transform.cpp
@@ -8,7 +8,7 @@
using namespace crepe::api;
-Transform::Transform(uint32_t game_id, Point & point, double rot, double scale)
+Transform::Transform(uint32_t game_id, const Point & point, double rot, double scale)
: Component(game_id), position(point), rotation(rot), scale(scale) {
dbg_trace();
}
diff --git a/src/crepe/api/Transform.h b/src/crepe/api/Transform.h
index c69ec61..c451c16 100644
--- a/src/crepe/api/Transform.h
+++ b/src/crepe/api/Transform.h
@@ -14,7 +14,7 @@ class Transform : public Component {
// works similar (or the same) as those found in GLSL?
public:
- Transform(uint32_t id, Point &, double, double);
+ Transform(uint32_t id, const Point &, double, double);
~Transform();
//! Translation (shift)
Point position;
diff --git a/src/example/audio_internal.cpp b/src/example/audio_internal.cpp
index 1199e2d..f35ad9d 100644
--- a/src/example/audio_internal.cpp
+++ b/src/example/audio_internal.cpp
@@ -5,26 +5,40 @@
#include <crepe/Sound.h>
#include <crepe/util/log.h>
+#include <crepe/api/Config.h>
-#include <chrono>
#include <thread>
using namespace crepe;
+using namespace crepe::api;
using namespace std;
using namespace std::chrono_literals;
using std::make_unique;
-int main() {
- dbg_trace();
+// Unrelated stuff that is not part of this POC
+int _ = [] () {
+ // Show dbg_trace() output
+ auto & cfg = api::Config::get_instance();
+ cfg.log.level = util::LogLevel::TRACE;
+
+ return 0; // satisfy compiler
+}();
+
+
+int main() {
+ // Load a background track (Ogg Vorbis)
auto bgm = Sound("../mwe/audio/bgm.ogg");
+ // Load three short samples (WAV)
auto sfx1 = Sound("../mwe/audio/sfx1.wav");
auto sfx2 = Sound("../mwe/audio/sfx2.wav");
auto sfx3 = Sound("../mwe/audio/sfx3.wav");
+ // Start the background track
bgm.play();
- // play each sample sequentially
+ // Play each sample sequentially while pausing and resuming the background
+ // track
this_thread::sleep_for(500ms);
sfx1.play();
this_thread::sleep_for(500ms);
@@ -35,11 +49,12 @@ int main() {
bgm.play();
this_thread::sleep_for(500ms);
- // play all samples simultaniously
+ // Play all samples simultaniously
sfx1.play();
sfx2.play();
sfx3.play();
this_thread::sleep_for(1000ms);
- return 0;
+ // Stop all audio and exit
+ return EXIT_SUCCESS;
}
diff --git a/src/example/log.cpp b/src/example/log.cpp
index 3bc6d80..04ab9cd 100644
--- a/src/example/log.cpp
+++ b/src/example/log.cpp
@@ -9,16 +9,21 @@
using namespace crepe;
using namespace crepe::util;
-int main() {
- auto & cfg = api::Config::get_instance();
+// unrelated setup code
+int _ = [] () {
// make sure all log messages get printed
+ auto & cfg = api::Config::get_instance();
cfg.log.level = util::LogLevel::TRACE;
+ return 0; // satisfy compiler
+} ();
+
+int main() {
dbg_trace();
- dbg_logf("cfg.log.color is equal to %d", cfg.log.color);
- logf(LogLevel::INFO, "info message!");
- logf(LogLevel::WARNING, "very scary warning");
- logf(LogLevel::ERROR, "fatal error!!!");
+ dbg_logf("test printf parameters: %d", 3);
+ logf(LogLevel::INFO, "info message");
+ logf(LogLevel::WARNING, "warning");
+ logf(LogLevel::ERROR, "error");
return 0;
}
diff --git a/src/example/script.cpp b/src/example/script.cpp
index 43f1c22..cda9591 100644
--- a/src/example/script.cpp
+++ b/src/example/script.cpp
@@ -17,27 +17,38 @@ using namespace crepe;
using namespace crepe::api;
using namespace std;
+// Unrelated stuff that is not part of this POC
+int _ = [] () {
+ // Show dbg_trace() output
+ auto & cfg = api::Config::get_instance();
+ cfg.log.level = util::LogLevel::TRACE;
+
+ return 0; // satisfy compiler
+}();
+
+
+
+// User-defined script:
class MyScript : public Script {
void update() {
+ // Retrieve component from the same GameObject this script is on
Transform & test = get_component<Transform>();
dbg_logf("Transform(%.2f, %.2f)", test.position.x, test.position.y);
}
};
int main() {
- auto & cfg = api::Config::get_instance();
- cfg.log.level = util::LogLevel::TRACE;
-
+ // Create game object with Transform and BehaviorScript components
auto obj = GameObject(0, "name", "tag", 0);
- Point point = {
- .x = 1.2,
- .y = 3.4,
- };
- obj.add_component<Transform>(point, 0, 0);
+ obj.add_component<Transform>(Point { .x = 1.2, .y = 3.4, }, 0, 0);
obj.add_component<BehaviorScript>().set_script<MyScript>();
+ // Get ScriptSystem singleton instance (this would normally be done from the
+ // game loop)
auto & sys = ScriptSystem::get_instance();
- sys.update(); // -> MyScript::update
+ // Update all scripts. This should result in MyScript::update being called
+ sys.update();
- return 0;
+ return EXIT_SUCCESS;
}
+
diff --git a/src/readme.md b/src/readme.md
index a8ffc51..15fa6f3 100644
--- a/src/readme.md
+++ b/src/readme.md
@@ -8,27 +8,27 @@ Examples (using Ninja):
```
$ cmake -B build -G Ninja
-$ ninja -C build
+$ cmake --build build
```
Unit tests can be built by explicitly specifying the target `test_main` when
running the build command:
```
-$ ninja -C build test_main
+$ cmake --build build --target test_main
```
Each source file in the example/ folder corresponds to a CMake target as well
(all examples can be built at once by specifying the `examples` target):
```
-$ ninja -C build audio_internal components_internal
+$ cmake --build build --target audio_internal script
```
For installing crêpe system-wide after building (install must be run with
elevated privileges):
```
-# ninja -C build install
+# cmake --install build
```