evol3D/evol-sandbox
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added input module

Browse Source 
Signed-off-by: Robear Selwans <robear.selwans@outlook.com>
This commit is contained in:
Robear Selwans
2021-05-11 18:22:42 +02:00
parent 9dc81756a8
commit 6f602db72f
1 changed files with 29 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/main.c
View File

@@ -35,6 +35,7 @@ DECLARE_EVENT_LISTENER(keyPressedListener, (KeyPressedEvent *event) {
#define IMPORT_NAMESPACES do { \ #define IMPORT_NAMESPACES do { \
IMPORT_NAMESPACE(ECS, ecs_module); \ IMPORT_NAMESPACE(ECS, ecs_module); \
IMPORT_NAMESPACE(Window, window_module); \ IMPORT_NAMESPACE(Window, window_module); \
IMPORT_NAMESPACE(Input, input_module); \
IMPORT_NAMESPACE(Physics, physics_module); \ IMPORT_NAMESPACE(Physics, physics_module); \
IMPORT_NAMESPACE(Rigidbody, physics_module); \ IMPORT_NAMESPACE(Rigidbody, physics_module); \
IMPORT_NAMESPACE(CollisionShape, physics_module); \ IMPORT_NAMESPACE(CollisionShape, physics_module); \
@@ -50,6 +51,7 @@ int main(int argc, char **argv)
evolmodule_t script_module = evol_loadmodule("script"); DEBUG_ASSERT(script_module); evolmodule_t script_module = evol_loadmodule("script"); DEBUG_ASSERT(script_module);
evolmodule_t ecs_module = evol_loadmodule("ecs"); DEBUG_ASSERT(ecs_module); evolmodule_t ecs_module = evol_loadmodule("ecs"); DEBUG_ASSERT(ecs_module);
evolmodule_t window_module = evol_loadmodule("window"); DEBUG_ASSERT(window_module); evolmodule_t window_module = evol_loadmodule("window"); DEBUG_ASSERT(window_module);
evolmodule_t input_module = evol_loadmodule("input"); DEBUG_ASSERT(input_module);
evolmodule_t physics_module = evol_loadmodule("physics"); DEBUG_ASSERT(physics_module); evolmodule_t physics_module = evol_loadmodule("physics"); DEBUG_ASSERT(physics_module);
@@ -57,6 +59,7 @@ int main(int argc, char **argv)
IMPORT_EVENTS_evmod_glfw(window_module); IMPORT_EVENTS_evmod_glfw(window_module);
WindowHandle windowHandle = Window->create(800, 600, "Main Window"); WindowHandle windowHandle = Window->create(800, 600, "Main Window");
Input->setActiveWindow(windowHandle);
ACTIVATE_EVENT_LISTENER(keyPressedListener, KeyPressedEvent); ACTIVATE_EVENT_LISTENER(keyPressedListener, KeyPressedEvent);
@@ -69,16 +72,31 @@ int main(int argc, char **argv)
ECSEntityID ent2 = ECS->createEntity(); ECSEntityID ent2 = ECS->createEntity();
ScriptHandle ent1ScriptHandle = Script->new("Entity1Script", ScriptHandle ent1ScriptHandle = Script->new("Entity1Script",
"this.on_update = function ()\n" /* "this.on_update = function ()\n" */
" rb = this:getComponent(Rigidbody)\n" /* " rb = this:getComponent(Rigidbody)\n" */
" rb:addForce(Vec3:new(2, 0, 0))\n" /* " rb:addForce(Vec3:new(2, 0, 0))\n" */
"end" /* "end" */
""
); );
ScriptHandle ent2ScriptHandle = Script->new("Entity2Script", ScriptHandle ent2ScriptHandle = Script->new("Entity2Script",
"this.on_update = function ()\n" "this.on_update = function ()\n"
" rb = this:getComponent(Rigidbody)\n" " rb = this:getComponent(Rigidbody)\n"
" rb:addForce(Vec3:new(-2, 0, 0))\n" " if Input.getKeyDown(Input.KeyCode.Space) then\n"
" rb:addForce(Vec3:new(0, 100, 0))\n"
" end\n"
" if Input.getKeyDown(Input.KeyCode.D) then\n"
" rb:addForce(Vec3:new(10, 0, 0))\n"
" end\n"
" if Input.getKeyDown(Input.KeyCode.A) then\n"
" rb:addForce(Vec3:new(-10, 0, 0))\n"
" end\n"
" if Input.getKeyDown(Input.KeyCode.W) then\n"
" rb:addForce(Vec3:new(0, 0, -10))\n"
" end\n"
" if Input.getKeyDown(Input.KeyCode.S) then\n"
" rb:addForce(Vec3:new(0, 0, 10))\n"
" end\n"
"end" "end"
); );
@@ -92,7 +110,7 @@ int main(int argc, char **argv)
.type = EV_RIGIDBODY_DYNAMIC, .type = EV_RIGIDBODY_DYNAMIC,
.collisionShape = boxCollider, .collisionShape = boxCollider,
.mass = 1.0, .mass = 1.0,
.restitution = 1.0 .restitution = 0.0
}; };
RigidbodyHandle box = Rigidbody->new(&rbInfo); RigidbodyHandle box = Rigidbody->new(&rbInfo);
@@ -106,7 +124,7 @@ int main(int argc, char **argv)
RigidbodyInfo groundRbInfo = { RigidbodyInfo groundRbInfo = {
.type = EV_RIGIDBODY_STATIC, .type = EV_RIGIDBODY_STATIC,
.collisionShape = groundCollider, .collisionShape = groundCollider,
.restitution = 1.0 .restitution = 0.0
}; };
RigidbodyHandle ground = Rigidbody->new(&groundRbInfo); RigidbodyHandle ground = Rigidbody->new(&groundRbInfo);
Rigidbody->setPosition(ground, Vec3new(0, -10, -10)); Rigidbody->setPosition(ground, Vec3new(0, -10, -10));
@@ -132,14 +150,15 @@ int main(int argc, char **argv)
} }
// Remove the following section // Remove the following section
RigidbodyHandle testHandle = Rigidbody->getFromEntity(ent1); /* RigidbodyHandle testHandle = Rigidbody->getFromEntity(ent1); */
Vec3 pos = Rigidbody->getPosition(testHandle); /* Vec3 pos = Rigidbody->getPosition(testHandle); */
printf("Current position of Entity1 = (%f, %f, %f)\n", pos.x, pos.y, pos.z); /* printf("Current position of Entity1 = (%f, %f, %f)\n", pos.x, pos.y, pos.z); */
sleep_ms(17); sleep_ms(17);
} }
evol_unloadmodule(physics_module); evol_unloadmodule(physics_module);
evol_unloadmodule(input_module);
evol_unloadmodule(window_module); evol_unloadmodule(window_module);
evol_unloadmodule(ecs_module); evol_unloadmodule(ecs_module);
evol_unloadmodule(script_module); evol_unloadmodule(script_module);