[.travis.yml] Small fix. [entt] Updated.

Unarelith · Apr 29, 2020 · 3272c3c · 3272c3c
1 parent c1097d4
commit 3272c3c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -46,7 +46,9 @@ before_install:
   - cd ..
 
 script:
-  - cmake .
+  - mkdir build
+  - cd build
+  - cmake ..
   - make -j8
 
 notifications:

diff --git a/source/client/network/ClientCommandHandler.cpp b/source/client/network/ClientCommandHandler.cpp
@@ -258,7 +258,7 @@ void ClientCommandHandler::setupCallbacks() {
 		if (it == m_entityMap.end()) {
 			entt::entity entity = registry.create();
 			m_entityMap.emplace(entityID, entity);
-			registry.assign<NetworkComponent>(entity, entityID);
+			registry.emplace<NetworkComponent>(entity, entityID);
 		}
 		else if (registry.get<NetworkComponent>(it->second).entityID != entityID) {
 			gkError() << "EntitySpawn: Entity ID" << entityID << "is invalid";
@@ -283,7 +283,7 @@ void ClientCommandHandler::setupCallbacks() {
 
 		auto it = m_entityMap.find(entityID);
 		if (it != m_entityMap.end()) {
-			auto &position = m_world.scene().registry().get_or_assign<PositionComponent>(it->second);
+			auto &position = m_world.scene().registry().get_or_emplace<PositionComponent>(it->second);
 			packet >> position.x >> position.y >> position.z;
 		}
 		else
@@ -299,7 +299,7 @@ void ClientCommandHandler::setupCallbacks() {
 			float w, x, y, z;
 			packet >> w >> x >> y >> z;
 
-			auto &rotation = m_world.scene().registry().get_or_assign<RotationComponent>(it->second);
+			auto &rotation = m_world.scene().registry().get_or_emplace<RotationComponent>(it->second);
 			rotation.quat = glm::quat(w, x, y, z);
 		}
 		else
@@ -312,7 +312,7 @@ void ClientCommandHandler::setupCallbacks() {
 
 		auto it = m_entityMap.find(entityID);
 		if (it != m_entityMap.end()) {
-			auto &animation = m_world.scene().registry().get_or_assign<AnimationComponent>(it->second);
+			auto &animation = m_world.scene().registry().get_or_emplace<AnimationComponent>(it->second);
 			animation.deserialize(packet);
 		}
 		else
@@ -325,7 +325,7 @@ void ClientCommandHandler::setupCallbacks() {
 
 		auto it = m_entityMap.find(entityID);
 		if (it != m_entityMap.end()) {
-			packet >> m_world.scene().registry().get_or_assign<DrawableDef>(it->second);
+			packet >> m_world.scene().registry().get_or_emplace<DrawableDef>(it->second);
 		}
 		else
 			gkError() << "EntityDrawableDef: Entity ID" << entityID << "is invalid";

diff --git a/source/client/scene/RenderingController.cpp b/source/client/scene/RenderingController.cpp
@@ -39,7 +39,7 @@ void RenderingController::update(entt::registry &registry) {
 	registry.view<DrawableDef>(entt::exclude<DrawableComponent>).each([&](auto entity, auto &drawableDef) {
 		const InventoryCubeDef &cubeDef = drawableDef.getInventoryCubeDef();
 
-		DrawableComponent &drawable = registry.get_or_assign<DrawableComponent>(entity);
+		DrawableComponent &drawable = registry.get_or_emplace<DrawableComponent>(entity);
 
 		InventoryCube &cube = drawable.setDrawable<InventoryCube>(cubeDef.size, true);
 		cube.setOrigin(cubeDef.origin);

diff --git a/source/server/scene/ItemDropFactory.cpp b/source/server/scene/ItemDropFactory.cpp
@@ -38,21 +38,21 @@ static u32 counter = 0; // FIXME: TEMPORARY
 
 void ItemDropFactory::create(entt::registry &registry, double x, double y, double z, const std::string &itemID, u16 amount) {
 	auto entity = registry.create();
-	registry.assign<PositionComponent>(entity, x, y, z);
-	registry.assign<RotationComponent>(entity);
-	registry.assign<NetworkComponent>(entity, counter++);
+	registry.emplace<PositionComponent>(entity, x, y, z);
+	registry.emplace<RotationComponent>(entity);
+	registry.emplace<NetworkComponent>(entity, counter++);
 
-	auto &drawableDef = registry.assign<DrawableDef>(entity);
+	auto &drawableDef = registry.emplace<DrawableDef>(entity);
 	auto &cube = drawableDef.addInventoryCube();
 	cube.size = 0.25f;
 	cube.origin = gk::Vector3f{cube.size / 2.f, cube.size / 2.f, cube.size / 2.f};
 	cube.blockID = itemID;
 
-	auto &animationComponent = registry.assign<AnimationComponent>(entity);
+	auto &animationComponent = registry.emplace<AnimationComponent>(entity);
 	animationComponent.addRotation(0.f, 0.f, 1.f, 0.5f);
 	animationComponent.addTranslation(0.f, 0.f, -0.0005f, -0.2f, 0.f, true);
 
-	registry.assign<gk::DoubleBox>(entity, 0., 0., 0., cube.size, cube.size, cube.size);
-	registry.assign<ItemStack>(entity, itemID, amount);
+	registry.emplace<gk::DoubleBox>(entity, 0., 0., 0., cube.size, cube.size, cube.size);
+	registry.emplace<ItemStack>(entity, itemID, amount);
 }