diff options
| author | Yann Herklotz <ymherklotz@gmail.com> | 2018-02-13 19:16:22 +0000 |
|---|---|---|
| committer | Yann Herklotz <ymherklotz@gmail.com> | 2018-02-13 19:16:22 +0000 |
| commit | 2fe3434682aae38bb0ab414135c2311110a6db90 (patch) | |
| tree | 1dff4aea6a59c466ea6a6f15ad7f5e2ac69f5b37 /tests | |
| parent | 400e8188a312abc7e5a0c7378dbd64fb8e0705e0 (diff) | |
| parent | 49af8b16ae3f9e6579656ed10f815e9c465557d0 (diff) | |
| download | YAGE-2fe3434682aae38bb0ab414135c2311110a6db90.tar.gz YAGE-2fe3434682aae38bb0ab414135c2311110a6db90.zip | |
Merge branch 'entity'
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/engine/entities.json | 23 | ||||
| -rw-r--r-- | tests/engine/test.cpp | 4 |
2 files changed, 25 insertions, 2 deletions
diff --git a/tests/engine/entities.json b/tests/engine/entities.json new file mode 100644 index 00000000..25959311 --- /dev/null +++ b/tests/engine/entities.json @@ -0,0 +1,23 @@ +{ + "Entities": [ + { + "name": "Object1", + "mass": "Hello", + "position": [ + 0, + 0, + 0 + ], + "velocity": [ + 0, + 0, + 0 + ], + "acceleration": [ + 0, + 0, + 0 + ] + } + ] +} diff --git a/tests/engine/test.cpp b/tests/engine/test.cpp index 6026e40a..5095a974 100644 --- a/tests/engine/test.cpp +++ b/tests/engine/test.cpp @@ -1,4 +1,4 @@ -#include <yage/engine/space.h> +#include <yage/entity/space.h> #include <yage/yage.h> @@ -8,12 +8,12 @@ int main() auto entity = space.createEntity(); auto entity2 = space.createEntity(); auto entity3 = space.createEntity(); - auto entity4 = space.createEntity(); yLogInfo << "Entity 1: " << entity; yLogInfo << "Entity 3: " << entity3; yLogInfo << "Entity 2: " << entity2; yLogInfo << "Entity 4: " << entity4; + return 0; } |