remove deprecated entity::name

malytomas · malytomas · commit cabc3941681a · 2024-10-29T23:43:54.000+01:00
diff --git a/sources/include/cage-core/entities.h b/sources/include/cage-core/entities.h
@@ -40,7 +40,6 @@ namespace cage
 		Entity *tryGet(uint32 entityId) const; // return nullptr if it does not exist
 		Entity *get(uint32 entityId) const; // throw if it does not exist
 		Entity *getOrCreate(uint32 entityId);
-		[[deprecated]] bool has(uint32 entityId) const { return exists(entityId); }
 		bool exists(uint32 entityId) const;
 		PointerRange<Entity *const> entities() const;
 		CAGE_FORCE_INLINE uint32 count() const { return numeric_cast<uint32>(entities().size()); }
@@ -76,7 +75,6 @@ namespace cage
 	{
 	public:
 		EntityManager *manager() const;
-		[[deprecated]] uint32 name() const { return id(); }
 		uint32 id() const;
 
 		CAGE_FORCE_INLINE void add(EntityComponent *component) { unsafeValue(component); }
diff --git a/sources/libcore/entities.cpp b/sources/libcore/entities.cpp
@@ -51,7 +51,7 @@ namespace cage
 				static constexpr uint32 b = (uint32)1 << 30;
 				if (generateId < a || generateId > b)
 					generateId = a;
-				while (has(generateId))
+				while (exists(generateId))
 					generateId = generateId == b ? a : generateId + 1;
 				return generateId++;
 			}
diff --git a/sources/libengine/graphics/renderPipeline.cpp b/sources/libengine/graphics/renderPipeline.cpp
@@ -1251,7 +1251,7 @@ namespace cage
 			Holder<AsyncTask> prepareShadowmap(CameraData &camera, Entity *e, const LightComponent &lc, const ShadowmapComponent &sc) const
 			{
 				ShadowmapData &data = camera.shadowmaps[e];
-				data.name = Stringizer() + camera.name + "_shadowmap_" + e->name();
+				data.name = Stringizer() + camera.name + "_shadowmap_" + e->id();
 				data.camera.sceneMask = camera.camera.sceneMask;
 				data.lightComponent = lc;
 				data.shadowmapComponent = sc;
diff --git a/sources/libengine/gui/events.cpp b/sources/libengine/gui/events.cpp
@@ -13,7 +13,7 @@ namespace cage
 	{
 		void findWidgets(HierarchyItem *item, uint32 name, std::vector<WidgetItem *> &result)
 		{
-			if (item->ent && item->ent->name() == name)
+			if (item->ent && item->ent->id() == name)
 			{
 				if (WidgetItem *w = dynamic_cast<WidgetItem *>(+item->item))
 					result.push_back(w);
diff --git a/sources/libengine/gui/gui.cpp b/sources/libengine/gui/gui.cpp
@@ -169,14 +169,14 @@ namespace cage
 			// create all items
 			for (auto e : impl->entityMgr->entities())
 			{
-				const uint32 name = e->name();
+				const uint32 name = e->id();
 				CAGE_ASSERT(name != 0 && name != m);
 				map[name] = impl->memory->createHolder<HierarchyItem>(impl, e);
 			}
 			// attach all items to their parents
 			for (auto e : impl->entityMgr->entities())
 			{
-				const uint32 name = e->name();
+				const uint32 name = e->id();
 				Holder<HierarchyItem> item = map[name].share();
 				if (e->has<GuiParentComponent>())
 				{
@@ -467,7 +467,7 @@ namespace cage
 		void guiDestroyChildrenRecursively(Entity *root)
 		{
 			std::vector<Entity *> ents;
-			const uint32 name = root->name();
+			const uint32 name = root->id();
 			entitiesVisitor(
 				[name, &ents](Entity *e, const GuiParentComponent &p)
 				{
diff --git a/sources/libengine/gui/guiBuilder.cpp b/sources/libengine/gui/guiBuilder.cpp
@@ -38,7 +38,7 @@ namespace cage
 			impl->nextName = 0;
 			if (!impl->stack.empty())
 			{
-				e->value<GuiParentComponent>().parent = impl->stack.back().e->name();
+				e->value<GuiParentComponent>().parent = impl->stack.back().e->id();
 				e->value<GuiParentComponent>().order = impl->stack.back().order++;
 			}
 			impl->stack.push_back({ e });
diff --git a/sources/libengine/gui/items.cpp b/sources/libengine/gui/items.cpp
@@ -145,15 +145,15 @@ namespace cage
 	bool WidgetItem::hasFocus(uint32 parts) const
 	{
 		CAGE_ASSERT(hierarchy->ent);
-		return hierarchy->impl->focusName && hierarchy->impl->focusName == hierarchy->ent->name() && (hierarchy->impl->focusParts & parts) > 0;
+		return hierarchy->impl->focusName && hierarchy->impl->focusName == hierarchy->ent->id() && (hierarchy->impl->focusParts & parts) > 0;
 	}
 
 	void WidgetItem::makeFocused(uint32 parts)
 	{
 		CAGE_ASSERT(parts != 0);
 		CAGE_ASSERT(hierarchy->ent);
 		CAGE_ASSERT(!widgetState.disabled);
-		hierarchy->impl->focusName = hierarchy->ent->name();
+		hierarchy->impl->focusName = hierarchy->ent->id();
 		hierarchy->impl->focusParts = parts;
 	}
 
diff --git a/sources/libengine/gui/tooltips.cpp b/sources/libengine/gui/tooltips.cpp
@@ -198,7 +198,7 @@ namespace cage
 			CAGE_ASSERT(findHierarchy(+root, it.tooltip));
 			const Vec2 s = findHierarchy(+root, it.tooltip)->requestedSize;
 			it.tooltip->value<GuiExplicitSizeComponent>().size = s + Vec2(1e-5);
-			it.tooltip->value<GuiParentComponent>().parent = it.rootTooltip->name();
+			it.tooltip->value<GuiParentComponent>().parent = it.rootTooltip->id();
 			Vec2 &al = it.rootTooltip->value<GuiLayoutAlignmentComponent>().alignment;
 			switch (it.placement)
 			{
@@ -263,7 +263,7 @@ namespace cage
 		{
 			cfg.tooltip->value<GuiPanelComponent>();
 			Entity *e = cfg.tooltip->manager()->createUnique();
-			e->value<GuiParentComponent>().parent = cfg.tooltip->name();
+			e->value<GuiParentComponent>().parent = cfg.tooltip->id();
 			e->value<GuiLabelComponent>();
 			e->value<GuiTextComponent>() = *txt;
 		}
diff --git a/sources/libengine/window/window.cpp b/sources/libengine/window/window.cpp
@@ -584,8 +584,9 @@ namespace cage
 	void Window::mouseRelativeMovement(bool relative)
 	{
 		WindowImpl *impl = (WindowImpl *)this;
+		if (impl->mouseIntendRelative != relative)
+			impl->lastRelativePosition = Vec2::Nan();
 		impl->mouseIntendRelative = relative;
-		impl->lastRelativePosition = Vec2::Nan();
 	}
 
 	Vec2 Window::mousePosition() const
diff --git a/sources/libsimple/graphics.cpp b/sources/libsimple/graphics.cpp
@@ -242,7 +242,7 @@ namespace cage
 						if (e->has<ScreenSpaceEffectsComponent>())
 							data.inputs.effects = e->value<ScreenSpaceEffectsComponent>();
 						data.inputs.effects.gamma = Real(confRenderGamma);
-						data.inputs.name = Stringizer() + "camera_" + e->name();
+						data.inputs.name = Stringizer() + "camera_" + e->id();
 						data.inputs.target = cam.target ? TextureHandle(Holder<Texture>(cam.target, nullptr)) : TextureHandle();
 						data.inputs.resolution = cam.target ? cam.target->resolution() : windowResolution;
 						data.inputs.transform = modelTransform(e, eb.pipeline->interpolationFactor);
diff --git a/sources/libsimple/statisticsGui.cpp b/sources/libsimple/statisticsGui.cpp
@@ -47,22 +47,22 @@ namespace cage
 
 			void update()
 			{
-				if (statisticsScope != StatisticsGuiScopeEnum::None && (rootName == 0 || !engineGuiEntities()->has(rootName)))
+				if (statisticsScope != StatisticsGuiScopeEnum::None && (rootName == 0 || !engineGuiEntities()->exists(rootName)))
 					needRegen = true;
 				if (statisticsScope == StatisticsGuiScopeEnum::None && rootName != 0)
 					needRegen = true;
 				if (!needRegen)
 					return;
 				needRegen = false;
 
-				if (rootName != 0 && engineGuiEntities()->has(rootName))
+				if (rootName != 0 && engineGuiEntities()->exists(rootName))
 					detail::guiDestroyEntityRecursively(engineGuiEntities()->get(rootName));
 				rootName = 0;
 
 				if (statisticsScope == StatisticsGuiScopeEnum::None)
 					return;
 
-				rootName = engineGuiEntities()->createUnique()->name();
+				rootName = engineGuiEntities()->createUnique()->id();
 				Entity *root = engineGuiEntities()->get(rootName);
 				root->value<GuiParentComponent>().order = 9000;
 				Holder<GuiBuilder> g = newGuiBuilder(root);
diff --git a/sources/test-core/entities.cpp b/sources/test-core/entities.cpp
@@ -466,7 +466,7 @@ namespace
 					const bool w = randomChance() < 0.2;
 					for (Entity *e : components[i]->entities())
 					{
-						const uint32 n = e->name();
+						const uint32 n = e->id();
 						const uint32 je = min((n % TotalComponents) + UsedComponents, TotalComponents);
 						for (uint32 j = n % TotalComponents; j < je; j++)
 						{
diff --git a/sources/test-core/entitiesCopy.cpp b/sources/test-core/entitiesCopy.cpp
@@ -28,7 +28,7 @@ namespace
 		for (uint32 round = 0; round < 100; round++)
 		{
 			uint32 a = randomRange(1, 500);
-			if (man->has(a))
+			if (man->exists(a))
 			{
 				Entity *e = man->get(a);
 				if (randomChance() < 0.5)
@@ -76,13 +76,13 @@ namespace
 		// verify that names are correctly paired
 		for (Entity *ae : a->entities())
 		{
-			if (ae->name())
-				CAGE_TEST(b->has(ae->name()));
+			if (ae->id())
+				CAGE_TEST(b->exists(ae->id()));
 		}
 		for (Entity *be : b->entities())
 		{
-			if (be->name())
-				CAGE_TEST(a->has(be->name()));
+			if (be->id())
+				CAGE_TEST(a->exists(be->id()));
 		}
 
 		// generate components mapping
@@ -96,9 +96,9 @@ namespace
 		// verify values
 		for (Entity *ae : a->entities())
 		{
-			if (!ae->name())
+			if (!ae->id())
 				continue;
-			Entity *be = b->get(ae->name());
+			Entity *be = b->get(ae->id());
 
 			// compare values of all types in generic way
 			for (const auto &it : mapping)
diff --git a/sources/test-core/entitiesSerialization.cpp b/sources/test-core/entitiesSerialization.cpp
@@ -32,7 +32,7 @@ namespace
 		for (uint32 round = 0; round < 100; round++)
 		{
 			uint32 a = randomRange(1, 500);
-			if (man->has(a))
+			if (man->exists(a))
 				man->get(a)->destroy();
 			else
 			{
@@ -60,10 +60,10 @@ namespace
 	{
 		for (Entity *ea : a->entities())
 		{
-			uint32 aName = ea->name();
+			uint32 aName = ea->id();
 			if (aName == 0)
 				continue;
-			CAGE_TEST(b->has(aName));
+			CAGE_TEST(b->exists(aName));
 			Entity *eb = b->get(aName);
 			for (uint32 i = 0; i < 3; i++)
 			{
diff --git a/sources/test-core/entitiesVisitor.cpp b/sources/test-core/entitiesVisitor.cpp
@@ -62,12 +62,12 @@ namespace
 		b->value<Real>() = 4;
 		c->value<uint32>() = 5;
 
-		entitiesVisitor([](Entity *e, uint32 &u) { u = e->name(); }, +man, false);
+		entitiesVisitor([](Entity *e, uint32 &u) { u = e->id(); }, +man, false);
 
-		CAGE_TEST(a->value<uint32>() == a->name());
-		CAGE_TEST(c->value<uint32>() == c->name());
+		CAGE_TEST(a->value<uint32>() == a->id());
+		CAGE_TEST(c->value<uint32>() == c->id());
 
-		entitiesVisitor([](Entity *e, uint32 &u, Real &r) { r = e->name() - u; }, +man, false);
+		entitiesVisitor([](Entity *e, uint32 &u, Real &r) { r = e->id() - u; }, +man, false);
 
 		uint32 cnt = 0;
 		entitiesVisitor([&](Entity *) { cnt++; }, +man, false);
diff --git a/sources/test-entities/main.cpp b/sources/test-entities/main.cpp
@@ -258,7 +258,7 @@ struct Performance
 		{
 			// remove youngest entity from a random selection
 			std::array<Entity *, 4> arr = { pick(), pick(), pick(), pick() };
-			std::sort(arr.begin(), arr.end(), [](Entity *a, Entity *b) { return a->name() > b->name(); });
+			std::sort(arr.begin(), arr.end(), [](Entity *a, Entity *b) { return a->id() > b->id(); });
 			arr[0]->destroy();
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ namespace cage`
`51`	`51`	`static constexpr uint32 b = (uint32)1 << 30;`
`52`	`52`	`if (generateId < a \|\| generateId > b)`
`53`	`53`	`generateId = a;`
`54`		`- while (has(generateId))`
	`54`	`+ while (exists(generateId))`
`55`	`55`	`generateId = generateId == b ? a : generateId + 1;`
`56`	`56`	`return generateId++;`
`57`	`57`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1251,7 +1251,7 @@ namespace cage`
`1251`	`1251`	`Holder<AsyncTask> prepareShadowmap(CameraData &camera, Entity *e, const LightComponent &lc, const ShadowmapComponent &sc) const`
`1252`	`1252`	`{`
`1253`	`1253`	`ShadowmapData &data = camera.shadowmaps[e];`
`1254`		`- data.name = Stringizer() + camera.name + "_shadowmap_" + e->name();`
	`1254`	`+ data.name = Stringizer() + camera.name + "_shadowmap_" + e->id();`
`1255`	`1255`	`data.camera.sceneMask = camera.camera.sceneMask;`
`1256`	`1256`	`data.lightComponent = lc;`
`1257`	`1257`	`data.shadowmapComponent = sc;`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ namespace cage`
`13`	`13`	`{`
`14`	`14`	`void findWidgets(HierarchyItem item, uint32 name, std::vector<WidgetItem > &result)`
`15`	`15`	`{`
`16`		`- if (item->ent && item->ent->name() == name)`
	`16`	`+ if (item->ent && item->ent->id() == name)`
`17`	`17`	`{`
`18`	`18`	`if (WidgetItem w = dynamic_cast<WidgetItem >(+item->item))`
`19`	`19`	`result.push_back(w);`
Original file line number	Diff line number	Diff line change
`@@ -169,14 +169,14 @@ namespace cage`
`169`	`169`	`// create all items`
`170`	`170`	`for (auto e : impl->entityMgr->entities())`
`171`	`171`	`{`
`172`		`- const uint32 name = e->name();`
	`172`	`+ const uint32 name = e->id();`
`173`	`173`	`CAGE_ASSERT(name != 0 && name != m);`
`174`	`174`	`map[name] = impl->memory->createHolder<HierarchyItem>(impl, e);`
`175`	`175`	`}`
`176`	`176`	`// attach all items to their parents`
`177`	`177`	`for (auto e : impl->entityMgr->entities())`
`178`	`178`	`{`
`179`		`- const uint32 name = e->name();`
	`179`	`+ const uint32 name = e->id();`
`180`	`180`	`Holder<HierarchyItem> item = map[name].share();`
`181`	`181`	`if (e->has<GuiParentComponent>())`
`182`	`182`	`{`
`@@ -467,7 +467,7 @@ namespace cage`
`467`	`467`	`void guiDestroyChildrenRecursively(Entity *root)`
`468`	`468`	`{`
`469`	`469`	`std::vector<Entity *> ents;`
`470`		`- const uint32 name = root->name();`
	`470`	`+ const uint32 name = root->id();`
`471`	`471`	`entitiesVisitor(`
`472`	`472`	`[name, &ents](Entity *e, const GuiParentComponent &p)`
`473`	`473`	`{`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ namespace cage`
`38`	`38`	`impl->nextName = 0;`
`39`	`39`	`if (!impl->stack.empty())`
`40`	`40`	`{`
`41`		`- e->value<GuiParentComponent>().parent = impl->stack.back().e->name();`
	`41`	`+ e->value<GuiParentComponent>().parent = impl->stack.back().e->id();`
`42`	`42`	`e->value<GuiParentComponent>().order = impl->stack.back().order++;`
`43`	`43`	`}`
`44`	`44`	`impl->stack.push_back({ e });`
Original file line number	Diff line number	Diff line change
`@@ -145,15 +145,15 @@ namespace cage`
`145`	`145`	`bool WidgetItem::hasFocus(uint32 parts) const`
`146`	`146`	`{`
`147`	`147`	`CAGE_ASSERT(hierarchy->ent);`
`148`		`- return hierarchy->impl->focusName && hierarchy->impl->focusName == hierarchy->ent->name() && (hierarchy->impl->focusParts & parts) > 0;`
	`148`	`+ return hierarchy->impl->focusName && hierarchy->impl->focusName == hierarchy->ent->id() && (hierarchy->impl->focusParts & parts) > 0;`
`149`	`149`	`}`
`150`	`150`
`151`	`151`	`void WidgetItem::makeFocused(uint32 parts)`
`152`	`152`	`{`
`153`	`153`	`CAGE_ASSERT(parts != 0);`
`154`	`154`	`CAGE_ASSERT(hierarchy->ent);`
`155`	`155`	`CAGE_ASSERT(!widgetState.disabled);`
`156`		`- hierarchy->impl->focusName = hierarchy->ent->name();`
	`156`	`+ hierarchy->impl->focusName = hierarchy->ent->id();`
`157`	`157`	`hierarchy->impl->focusParts = parts;`
`158`	`158`	`}`
`159`	`159`
Original file line number	Diff line number	Diff line change
`@@ -198,7 +198,7 @@ namespace cage`
`198`	`198`	`CAGE_ASSERT(findHierarchy(+root, it.tooltip));`
`199`	`199`	`const Vec2 s = findHierarchy(+root, it.tooltip)->requestedSize;`
`200`	`200`	`it.tooltip->value<GuiExplicitSizeComponent>().size = s + Vec2(1e-5);`
`201`		`- it.tooltip->value<GuiParentComponent>().parent = it.rootTooltip->name();`
	`201`	`+ it.tooltip->value<GuiParentComponent>().parent = it.rootTooltip->id();`
`202`	`202`	`Vec2 &al = it.rootTooltip->value<GuiLayoutAlignmentComponent>().alignment;`
`203`	`203`	`switch (it.placement)`
`204`	`204`	`{`
`@@ -263,7 +263,7 @@ namespace cage`
`263`	`263`	`{`
`264`	`264`	`cfg.tooltip->value<GuiPanelComponent>();`
`265`	`265`	`Entity *e = cfg.tooltip->manager()->createUnique();`
`266`		`- e->value<GuiParentComponent>().parent = cfg.tooltip->name();`
	`266`	`+ e->value<GuiParentComponent>().parent = cfg.tooltip->id();`
`267`	`267`	`e->value<GuiLabelComponent>();`
`268`	`268`	`e->value<GuiTextComponent>() = *txt;`
`269`	`269`	`}`
Original file line number	Diff line number	Diff line change
`@@ -584,8 +584,9 @@ namespace cage`
`584`	`584`	`void Window::mouseRelativeMovement(bool relative)`
`585`	`585`	`{`
`586`	`586`	`WindowImpl impl = (WindowImpl )this;`
	`587`	`+ if (impl->mouseIntendRelative != relative)`
	`588`	`+ impl->lastRelativePosition = Vec2::Nan();`
`587`	`589`	`impl->mouseIntendRelative = relative;`
`588`		`- impl->lastRelativePosition = Vec2::Nan();`
`589`	`590`	`}`
`590`	`591`
`591`	`592`	`Vec2 Window::mousePosition() const`