Fixed player?
This commit is contained in:
parent
ed2614fb30
commit
5de76322de
26
maze.c
26
maze.c
@ -514,10 +514,6 @@ ECS_COMPONENT(ecs_autorotate);
|
|||||||
ECS_COMPONENT(ecs_placement);
|
ECS_COMPONENT(ecs_placement);
|
||||||
ECS_COMPONENT(ecs_camera);
|
ECS_COMPONENT(ecs_camera);
|
||||||
ECS_COMPONENT(ecs_smartai);
|
ECS_COMPONENT(ecs_smartai);
|
||||||
// ECS_COMPONENT(ecs_moveto);
|
|
||||||
// ECS_COMPONENT(ecs_rotateto);
|
|
||||||
// ECS_COMPONENT(ecs_camera);
|
|
||||||
// ECS_COMPONENT(ecs_maze);
|
|
||||||
ECS_END(mecs)
|
ECS_END(mecs)
|
||||||
|
|
||||||
// And then a copy of the components here... that sucksssss
|
// And then a copy of the components here... that sucksssss
|
||||||
@ -529,23 +525,12 @@ ECS_CID(ecs_placement, 4);
|
|||||||
ECS_CID(ecs_camera, 5);
|
ECS_CID(ecs_camera, 5);
|
||||||
ECS_CID(ecs_smartai, 6);
|
ECS_CID(ecs_smartai, 6);
|
||||||
|
|
||||||
// ECS_CID(ecs_moveto, 0);
|
|
||||||
// ECS_CID(ecs_rotateto, 1);
|
|
||||||
// ECS_CID(ecs_camera, 3);
|
|
||||||
// ECS_CID(ecs_maze, 4);
|
|
||||||
|
|
||||||
ECS_SYSTEM1(mecs, sys_world, ecs_world);
|
ECS_SYSTEM1(mecs, sys_world, ecs_world);
|
||||||
ECS_SYSTEM2(mecs, sys_autonav, ecs_autonav, ecs_placement);
|
ECS_SYSTEM2(mecs, sys_autonav, ecs_autonav, ecs_placement);
|
||||||
ECS_SYSTEM2(mecs, sys_autorotate, ecs_autorotate, ecs_placement);
|
ECS_SYSTEM2(mecs, sys_autorotate, ecs_autorotate, ecs_placement);
|
||||||
ECS_SYSTEM2(mecs, sys_camera, ecs_camera, ecs_placement);
|
ECS_SYSTEM2(mecs, sys_camera, ecs_camera, ecs_placement);
|
||||||
ECS_SYSTEM4(mecs, sys_smartai, ecs_smartai, ecs_worldstate, ecs_autonav,
|
ECS_SYSTEM4(mecs, sys_smartai, ecs_smartai, ecs_worldstate, ecs_autonav,
|
||||||
ecs_autorotate);
|
ecs_autorotate);
|
||||||
// ECS_SYSTEM1(mecs, sys_ecs_moveto, ecs_moveto);
|
|
||||||
// ECS_SYSTEM1(mecs, sys_ecs_rotateto, ecs_rotateto);
|
|
||||||
// ECS_SYSTEM2(mecs, sys_ecs_moveto_camera, ecs_moveto, ecs_camera);
|
|
||||||
// ECS_SYSTEM2(mecs, sys_ecs_rotateto_camera, ecs_rotateto, ecs_camera);
|
|
||||||
// ECS_SYSTEM4(mecs, sys_ecs_smartai, ecs_smartai, ecs_maze, ecs_moveto,
|
|
||||||
// ecs_rotateto);
|
|
||||||
|
|
||||||
void init_floortexture(haloo3d_fb *floort) {
|
void init_floortexture(haloo3d_fb *floort) {
|
||||||
// uint16_t cols[4] = {0xFD93, 0xFB83, 0xFFFF}; //, 0xFDDD};
|
// uint16_t cols[4] = {0xFD93, 0xFB83, 0xFFFF}; //, 0xFDDD};
|
||||||
@ -690,20 +675,17 @@ int main() { // int argc, char **argv) {
|
|||||||
ecs_eid playerid = mecs_newentity(&ecs, 0);
|
ecs_eid playerid = mecs_newentity(&ecs, 0);
|
||||||
eprintf("Player eid: %d\n", playerid);
|
eprintf("Player eid: %d\n", playerid);
|
||||||
ECS_SETCOMPONENT(&ecs, playerid, ecs_worldstate){.state = &wstate};
|
ECS_SETCOMPONENT(&ecs, playerid, ecs_worldstate){.state = &wstate};
|
||||||
ECS_SETCOMPONENT(&ecs, playerid, ecs_placement){.pos = render.camera.pos};
|
ECS_SETCOMPONENT(&ecs, playerid, ecs_placement){};
|
||||||
ECS_SETCOMPONENT(&ecs, playerid, ecs_camera){.camera = &render.camera};
|
ECS_SETCOMPONENT(&ecs, playerid, ecs_camera){.camera = &render.camera};
|
||||||
ECS_SETCOMPONENT(&ecs, playerid, ecs_autonav){.timer = 0,
|
ECS_SETCOMPONENT(&ecs, playerid, ecs_autonav){.timer = 0,
|
||||||
.dest = render.camera.pos};
|
.dest = render.camera.pos};
|
||||||
ECS_SETCOMPONENT(&ecs, playerid, ecs_autorotate){.timer = 0};
|
ECS_SETCOMPONENT(&ecs, playerid, ecs_autorotate){
|
||||||
|
.timer = 0, .dest = {.x = render.camera.yaw, .y = render.camera.pitch}};
|
||||||
ECS_SETCOMPONENT(&ecs, playerid,
|
ECS_SETCOMPONENT(&ecs, playerid,
|
||||||
ecs_smartai){.state = SAI_INIT, .rotstate = 0, .timer = 0};
|
ecs_smartai){.state = SAI_INIT, .rotstate = 0, .timer = 0};
|
||||||
|
|
||||||
// if (playerid == -1) {
|
|
||||||
// dieerr("WHY IS PLAYERID -1???\n");
|
|
||||||
// }
|
|
||||||
|
|
||||||
// // System is setup such that camera position matches maze index
|
// // System is setup such that camera position matches maze index
|
||||||
// render.camera.pos.x = 0.5 * HSCALE;
|
// render.camera.pos.x = 1.5 * HSCALE;
|
||||||
// render.camera.pos.z = 0.5 * HSCALE;
|
// render.camera.pos.z = 0.5 * HSCALE;
|
||||||
|
|
||||||
// struct vec2i playerstart = {.x = 0, .y = 0};
|
// struct vec2i playerstart = {.x = 0, .y = 0};
|
||||||
|
Loading…
Reference in New Issue
Block a user