X-Git-Url: https://git.localhorst.tv/?a=blobdiff_plain;ds=sidebyside;f=src%2Fworld%2FEntity.h;h=a7e45d292b277490c41d9657c68d2082e9f375b0;hb=7fccdf2cd07afb3afdc0b854e9a03130ef202eec;hp=f8576c15374c33708fd010e20890197320266f43;hpb=dbc08d84d9de1a77cba0dd97e4701f4ac99d056e;p=orbi.git diff --git a/src/world/Entity.h b/src/world/Entity.h index f8576c1..a7e45d2 100644 --- a/src/world/Entity.h +++ b/src/world/Entity.h @@ -14,13 +14,17 @@ public: public: void Update(float dt, Vector extAcc, Vector tv); - void Move(Vector delta) { bounds.Move(delta); } + void Move(Vector delta); public: - AABB bounds; + Vector pos; Vector vel; Vector acc; + AABB bounds; + AABB vbox; + AABB hbox; + float mass = 1.0f; float elast = 0.75f;