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
743 properties.setRotation(quatFromVariant(anchorObject["rotation"].toVariant()));743 properties.setRotation(quatFromVariant(anchorObject["rotation"].toVariant()));
744 744
745 Anchor anchor;745 Anchor anchor;
746 anchor.entityID = entityScriptingInterface->addEntity(properties, QString("local"));746 anchor.entityID = entityScriptingInterface->addEntityInternal(properties, entity::HostType::LOCAL);
747 anchor.originalDimensions = dimensions;747 anchor.originalDimensions = dimensions;
748 _anchor = anchor;748 _anchor = anchor;
749 }749 }
@@ -765,7 +765,7 @@ void Keyboard::loadKeyboardFile(const QString& keyboardFile) { · 15 unmodified lines
765 properties.setParentID(_anchor.entityID);765 properties.setParentID(_anchor.entityID);
766 766
767 BackPlate backPlate;767 BackPlate backPlate;
768 backPlate.entityID = entityScriptingInterface->addEntity(properties, QString("local"));768 backPlate.entityID = entityScriptingInterface->addEntityInternal(properties, entity::HostType::LOCAL);
769 backPlate.dimensions = dimensions;769 backPlate.dimensions = dimensions;
770 EntityPropertyFlags desiredProperties;770 EntityPropertyFlags desiredProperties;
771 desiredProperties += PROP_LOCAL_POSITION;771 desiredProperties += PROP_LOCAL_POSITION;
@@ -822,7 +822,7 @@ void Keyboard::loadKeyboardFile(const QString& keyboardFile) { · 50 unmodified lines
822 properties.setTextures(QVariant(textureMap).toString());822 properties.setTextures(QVariant(textureMap).toString());
823 properties.getGrab().setGrabbable(false);823 properties.getGrab().setGrabbable(false);
824 properties.setLocalRotation(quatFromVariant(keyboardKeyValue["localOrientation"].toVariant()));824 properties.setLocalRotation(quatFromVariant(keyboardKeyValue["localOrientation"].toVariant()));
825 QUuid id = entityScriptingInterface->addEntity(properties, QString("local"));825 QUuid id = entityScriptingInterface->addEntityInternal(properties, entity::HostType::LOCAL);
826 key.setID(id);826 key.setID(id);
827 key.setKeyString(keyString);827 key.setKeyString(keyString);
828 key.saveDimensionsAndLocalPosition();828 key.saveDimensionsAndLocalPosition();
@@ -859,7 +859,7 @@ void Keyboard::loadKeyboardFile(const QString& keyboardFile) { · 30 unmodified lines
859 properties.setParentID(_anchor.entityID);859 properties.setParentID(_anchor.entityID);
860 860
861 TextDisplay textDisplay;861 TextDisplay textDisplay;
862 textDisplay.entityID = entityScriptingInterface->addEntity(properties, QString("local"));862 textDisplay.entityID = entityScriptingInterface->addEntityInternal(properties, entity::HostType::LOCAL);
863 textDisplay.localPosition = localPosition;863 textDisplay.localPosition = localPosition;
864 textDisplay.dimensions = dimensions;864 textDisplay.dimensions = dimensions;
865 textDisplay.lineHeight = lineHeight;865 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