History

resolve conflicts on merge with upstream/master

Stephen Birarda committed 11 years ago

Commit ed199872 parents e5a10e3 d623ba3135 files · +7479 −1841Browse files

Showing the changes to libraries/entities/src/EntityScriptingInterface.cpp (1 of 135 files). Show all

Unified · Split

libraries/entities/src/EntityScriptingInterface.cpp+7−0
@@ -493,6 +493,13 @@ bool EntityScriptingInterface::setAllVoxels(QUuid entityID, int value) { · 492 unmodified lines
493 });493 });
494}494}
495 495
496bool EntityScriptingInterface::setVoxelsInCuboid(QUuid entityID, const glm::vec3& lowPosition,
497 const glm::vec3& cuboidSize, int value) {
498 return setVoxels(entityID, [lowPosition, cuboidSize, value](PolyVoxEntityItem& polyVoxEntity) {
499 return polyVoxEntity.setCuboid(lowPosition, cuboidSize, value);
500 });
501}
502
496bool EntityScriptingInterface::setAllPoints(QUuid entityID, const QVector<glm::vec3>& points) {503bool EntityScriptingInterface::setAllPoints(QUuid entityID, const QVector<glm::vec3>& points) {
497 EntityItemPointer entity = static_cast<EntityItemPointer>(_entityTree->findEntityByEntityItemID(entityID));504 EntityItemPointer entity = static_cast<EntityItemPointer>(_entityTree->findEntityByEntityItemID(entityID));
498 if (!entity) {505 if (!entity) {