Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-24 21:36:31 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixing ambiguous "call to overloaded function compiler" errors on windows and linux builds

Browse source
This commit is contained in:
ericrius1 2015-08-03 12:31:21 -07:00
parent e4ff3fa9da
commit e36099f2b6
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
libraries/entities/src/EntityScriptingInterface.cpp
View file

@ -500,7 +500,7 @@ bool EntityScriptingInterface::setPoints(QUuid entityID, std::function<bool(Poly
EntityTypes::EntityType entityType = entity->getType(); EntityTypes::EntityType entityType = entity->getType();
if (entityType != EntityTypes::Line) { if (entityType != EntityTypes::PolyLine) {
return false; return false;
} }
@ -554,14 +554,14 @@ bool EntityScriptingInterface::setAllPoints(QUuid entityID, const QVector<glm::v
if (entityType == EntityTypes::Line) { if (entityType == EntityTypes::Line) {
return setPoints(entityID, [points](LineEntityItem& lineEntity) -> bool return setPoints(entityID, [points](LineEntityItem& lineEntity) -> bool
{ {
return lineEntity.setLinePoints(points); return (LineEntityItem*)lineEntity.setLinePoints(points);
}); });
} }
if (entityType == EntityTypes::PolyLine) { if (entityType == EntityTypes::PolyLine) {
return setPoints(entityID, [points](PolyLineEntityItem& PolyLineEntity) -> bool return setPoints(entityID, [points](PolyLineEntityItem& polyLineEntity) -> bool
{ {
return PolyLineEntity.setLinePoints(points); return (PolyLineEntityItem*)polyLineEntity.setLinePoints(points);
}); });
} }
@ -579,14 +579,14 @@ bool EntityScriptingInterface::appendPoint(QUuid entityID, const glm::vec3& poin
if (entityType == EntityTypes::Line) { if (entityType == EntityTypes::Line) {
return setPoints(entityID, [point](LineEntityItem& lineEntity) -> bool return setPoints(entityID, [point](LineEntityItem& lineEntity) -> bool
{ {
return lineEntity.appendPoint(point); return (LineEntityItem*)lineEntity.appendPoint(point);
}); });
} }
if (entityType == EntityTypes::PolyLine) { if (entityType == EntityTypes::PolyLine) {
return setPoints(entityID, [point](PolyLineEntityItem& PolyLineEntity) -> bool return setPoints(entityID, [point](PolyLineEntityItem& PolyLineEntity) -> bool
{ {
return PolyLineEntity.appendPoint(point); return (PolyLineEntityItem*)PolyLineEntity.appendPoint(point);
}); });
} }