diff options
author | jaroWMR <jarorutjes07@gmail.com> | 2024-10-23 16:22:30 +0200 |
---|---|---|
committer | jaroWMR <jarorutjes07@gmail.com> | 2024-10-23 16:22:30 +0200 |
commit | 5558d2d0530cc01fd8e3c8ce18cc38ce9c6f8057 (patch) | |
tree | d85836ede083ee9faa42eed6fc35bb6b980a8b6a /src/example | |
parent | 5445331293854aac26af2d5c6a20cedeaa819383 (diff) | |
parent | 04a040e28ade412ea5b1767bf77eed3956121973 (diff) |
merge with master
Diffstat (limited to 'src/example')
-rw-r--r-- | src/example/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/example/Physics.cpp | 9 | ||||
-rw-r--r-- | src/example/components_internal.cpp | 11 | ||||
-rw-r--r-- | src/example/script.cpp | 2 |
4 files changed, 18 insertions, 8 deletions
diff --git a/src/example/CMakeLists.txt b/src/example/CMakeLists.txt index 256d87e..ceb8f9d 100644 --- a/src/example/CMakeLists.txt +++ b/src/example/CMakeLists.txt @@ -1,3 +1,6 @@ +# all examples +add_custom_target(examples) + # add_example(target_name [SOURCES...]) function(add_example target_name) # if SOURCES is not specified @@ -10,6 +13,7 @@ function(add_example target_name) add_executable(${target_name} EXCLUDE_FROM_ALL ${sources}) target_link_libraries(${target_name} PUBLIC crepe) + add_dependencies(examples ${target_name}) endfunction() add_example(audio_internal) diff --git a/src/example/Physics.cpp b/src/example/Physics.cpp index 9ad6da0..6499fb0 100644 --- a/src/example/Physics.cpp +++ b/src/example/Physics.cpp @@ -2,13 +2,14 @@ #include <thread> #include <chrono> #include "Transform.h" -#include "Rigidbody.h" -#include "Force.h" +#include <crepe/api/Rigidbody.h> +#include <crepe/api/Force.h> #include "PhysicsSystem.h" #include <crepe/Component.h> #include <crepe/ComponentManager.h> -#include <crepe/GameObject.h> +#include <crepe/api/GameObject.h> +using namespace crepe::api; using namespace crepe; using namespace std; @@ -18,6 +19,8 @@ int main(int argc, char* argv[]) { GameObject * game_object[2]; game_object[1] = new GameObject(2, "Name", "Tag", 0); // not found not used game_object[0] = new GameObject(5, "Name", "Tag", 0); + Position position = {0, 0}; + game_object[0]->add_component<Transform>(position,0,0); game_object[0]->add_component<Rigidbody>(1, 1 , BodyType::Dynamic); game_object[0]->add_component<Force>(1 , 0); physicsSystem.update(); diff --git a/src/example/components_internal.cpp b/src/example/components_internal.cpp index 3ba5b5a..ae6c765 100644 --- a/src/example/components_internal.cpp +++ b/src/example/components_internal.cpp @@ -6,14 +6,17 @@ #include <cassert> #include <chrono> -#include <crepe/Collider.h> #include <crepe/Component.h> #include <crepe/ComponentManager.h> -#include <crepe/GameObject.h> -#include <crepe/Rigidbody.h> -#include <crepe/Sprite.h> + +#include <crepe/api/Collider.h> +#include <crepe/api/GameObject.h> +#include <crepe/api/Rigidbody.h> +#include <crepe/api/Sprite.h> + #include <crepe/util/log.h> +using namespace crepe::api; using namespace crepe; using namespace std; diff --git a/src/example/script.cpp b/src/example/script.cpp index cc585db..6e5563c 100644 --- a/src/example/script.cpp +++ b/src/example/script.cpp @@ -4,11 +4,11 @@ */ #include <crepe/ComponentManager.h> -#include <crepe/GameObject.h> #include <crepe/ScriptSystem.h> #include <crepe/util/log.h> #include <crepe/api/BehaviorScript.h> +#include <crepe/api/GameObject.h> #include <crepe/api/Script.h> using namespace crepe; |