Skip to content

Update ecs.hpp #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jamesn031199 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Update ecs.hpp #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 5 additions & 79 deletions src/ecs/ecs.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,88 +14,14 @@ class ECS
EntityHandle makeEntity(BaseECSComponent** components, const uint32* componentIDs, size_t numComponents);
void removeEntity(EntityHandle handle);

template<class A>
EntityHandle makeEntity(A& c1)
template<class... Components>
EntityHandle makeEntity(Components&&... entitycomponents)
{
BaseECSComponent* components[] = { &c1 };
uint32 componentIDs[] = {A::ID};
return makeEntity(components, componentIDs, 1);
BaseECSComponent* components[] = { (&entitycomponents)... };
uint32 componentIDs[] = { (std::remove_reference_t<Components>::ID)... };
return makeEntity(components, componentIDs, sizeof...(Components));
}

template<class A, class B>
EntityHandle makeEntity(A& c1, B& c2)
{
BaseECSComponent* components[] = { &c1, &c2 };
uint32 componentIDs[] = {A::ID, B::ID};
return makeEntity(components, componentIDs, 2);
}

template<class A, class B, class C>
EntityHandle makeEntity(A& c1, B& c2, C& c3)
{
BaseECSComponent* components[] = { &c1, &c2, &c3 };
uint32 componentIDs[] = {A::ID, B::ID, C::ID};
return makeEntity(components, componentIDs, 3);
}

template<class A, class B, class C, class D>
EntityHandle makeEntity(A& c1, B& c2, C& c3, D& c4)
{
BaseECSComponent* components[] = { &c1, &c2, &c3, &c4 };
uint32 componentIDs[] = {A::ID, B::ID, C::ID, D::ID};
return makeEntity(components, componentIDs, 4);
}

template<class A, class B, class C, class D, class E>
EntityHandle makeEntity(A& c1, B& c2, C& c3, D& c4, E& c5)
{
BaseECSComponent* components[] = { &c1, &c2, &c3, &c4, &c5 };
uint32 componentIDs[] = {A::ID, B::ID, C::ID, D::ID, E::ID};
return makeEntity(components, componentIDs, 5);
}

template<class A, class B, class C, class D, class E, class F>
EntityHandle makeEntity(A& c1, B& c2, C& c3, D& c4, E& c5, F& c6)
{
BaseECSComponent* components[] = { &c1, &c2, &c3, &c4, &c5, &c6};
uint32 componentIDs[] = {A::ID, B::ID, C::ID, D::ID, E::ID, F::ID};
return makeEntity(components, componentIDs, 6);
}

template<class A, class B, class C, class D, class E, class F, class G>
EntityHandle makeEntity(A& c1, B& c2, C& c3, D& c4, E& c5, F& c6, G& c7)
{
BaseECSComponent* components[] = { &c1, &c2, &c3, &c4, &c5, &c6, &c7};
uint32 componentIDs[] = {A::ID, B::ID, C::ID, D::ID, E::ID, F::ID, G::ID};
return makeEntity(components, componentIDs, 7);
}

template<class A, class B, class C, class D, class E, class F, class G, class H>
EntityHandle makeEntity(A& c1, B& c2, C& c3, D& c4, E& c5, F& c6, G& c7, H& c8)
{
BaseECSComponent* components[] = { &c1, &c2, &c3, &c4, &c5, &c6, &c7, &c8};
uint32 componentIDs[] = {A::ID, B::ID, C::ID, D::ID, E::ID, F::ID, G::ID, H::ID};
return makeEntity(components, componentIDs, 8);
}

template<class A, class B, class C, class D, class E, class F, class G, class H, class I>
EntityHandle makeEntity(A& c1, B& c2, C& c3, D& c4, E& c5, F& c6, G& c7, H& c8, I& c9)
{
BaseECSComponent* components[] = { &c1, &c2, &c3, &c4, &c5, &c6, &c7, &c8, &c9 };
uint32 componentIDs[] = {A::ID, B::ID, C::ID, D::ID, E::ID, F::ID, G::ID, H::ID, I::ID};
return makeEntity(components, componentIDs, 9);
}

template<class A, class B, class C, class D, class E, class F, class G, class H, class I, class J>
EntityHandle makeEntity(A& c1, B& c2, C& c3, D& c4, E& c5, F& c6, G& c7, H& c8, I& c9, J& c10)
{
BaseECSComponent* components[] = { &c1, &c2, &c3, &c4, &c5, &c6, &c7, &c8, &c9, &c10 };
uint32 componentIDs[] = {A::ID, B::ID, C::ID, D::ID, E::ID, F::ID, G::ID, H::ID, I::ID, J::ID };
return makeEntity(components, componentIDs, 10);
}



// Component methods
template<class Component>
inline void addComponent(EntityHandle entity, Component* component)
Expand Down