History

pointerevents are working!

SamGondelman committed 7 years ago

Commit 8f0bd241 parent abd7d6b9 files · +118 −130Browse files

Showing the changes to interface/src/ui/Keyboard.cpp (1 of 9 files). Show all

Unified · Split

interface/src/ui/Keyboard.cpp+4−4
@@ -743,7 +743,7 @@ void Keyboard::loadKeyboardFile(const QString& keyboardFile) { · 742 unmodified lines
743743 properties.setRotation(quatFromVariant(anchorObject["rotation"].toVariant()));
744744
745745 Anchor anchor;
746− anchor.entityID = entityScriptingInterface->addEntity(properties, QString("local"));
746+ anchor.entityID = entityScriptingInterface->addEntityInternal(properties, entity::HostType::LOCAL);
747747 anchor.originalDimensions = dimensions;
748748 _anchor = anchor;
749749 }
@@ -765,7 +765,7 @@ void Keyboard::loadKeyboardFile(const QString& keyboardFile) { · 15 unmodified lines
765765 properties.setParentID(_anchor.entityID);
766766
767767 BackPlate backPlate;
768− backPlate.entityID = entityScriptingInterface->addEntity(properties, QString("local"));
768+ backPlate.entityID = entityScriptingInterface->addEntityInternal(properties, entity::HostType::LOCAL);
769769 backPlate.dimensions = dimensions;
770770 EntityPropertyFlags desiredProperties;
771771 desiredProperties += PROP_LOCAL_POSITION;
@@ -822,7 +822,7 @@ void Keyboard::loadKeyboardFile(const QString& keyboardFile) { · 50 unmodified lines
822822 properties.setTextures(QVariant(textureMap).toString());
823823 properties.getGrab().setGrabbable(false);
824824 properties.setLocalRotation(quatFromVariant(keyboardKeyValue["localOrientation"].toVariant()));
825− QUuid id = entityScriptingInterface->addEntity(properties, QString("local"));
825+ QUuid id = entityScriptingInterface->addEntityInternal(properties, entity::HostType::LOCAL);
826826 key.setID(id);
827827 key.setKeyString(keyString);
828828 key.saveDimensionsAndLocalPosition();
@@ -859,7 +859,7 @@ void Keyboard::loadKeyboardFile(const QString& keyboardFile) { · 30 unmodified lines
859859 properties.setParentID(_anchor.entityID);
860860
861861 TextDisplay textDisplay;
862− textDisplay.entityID = entityScriptingInterface->addEntity(properties, QString("local"));
862+ textDisplay.entityID = entityScriptingInterface->addEntityInternal(properties, entity::HostType::LOCAL);
863863 textDisplay.localPosition = localPosition;
864864 textDisplay.dimensions = dimensions;
865865 textDisplay.lineHeight = lineHeight;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t