Skip to content

Commit 618b15f

Browse files
committed
Changed inputMapping -> currentInputMapping
1 parent 4b58bb4 commit 618b15f

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

‎examples/basic/index.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,11 +115,11 @@
115115
drawText(text);
116116
}
117117

118-
mappingText.setAttribute('text', {value: 'Current mapping: ' + AFRAME.currentMapping});
118+
mappingText.setAttribute('text', {value: 'Current mapping: ' + AFRAME.currentInputMapping});
119119

120120
scene.addEventListener('changeTask', function(evt) {
121-
AFRAME.currentMapping = AFRAME.currentMapping === 'default' ? 'task1' : 'default';
122-
mappingText.setAttribute('text', {value: 'Current mapping: ' + AFRAME.currentMapping});
121+
AFRAME.currentInputMapping = AFRAME.currentInputMapping === 'default' ? 'task1' : 'default';
122+
mappingText.setAttribute('text', {value: 'Current mapping: ' + AFRAME.currentInputMapping});
123123
logEvent(evt);
124124
});
125125

‎index.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ if (typeof AFRAME === 'undefined') {
44
throw new Error('Component attempted to register before AFRAME was available.');
55
}
66

7-
AFRAME.currentMapping = 'default';
7+
AFRAME.currentInputMapping = 'default';
88
AFRAME.inputMappings = {};
99

1010
AFRAME.registerSystem('input-mapping', {
@@ -92,7 +92,7 @@ AFRAME.registerSystem('input-mapping', {
9292
for (var eventName in mappingsPerController) {
9393
var handler = function (event) {
9494
var mapping = mappingsPerController[event.type];
95-
var mappedEvent = mapping[AFRAME.currentMapping] ? mapping[AFRAME.currentMapping] : mapping.default;
95+
var mappedEvent = mapping[AFRAME.currentInputMapping] ? mapping[AFRAME.currentInputMapping] : mapping.default;
9696
if (mappedEvent) {
9797
event.detail.target.emit(mappedEvent, event.detail);
9898
}
@@ -104,7 +104,7 @@ AFRAME.registerSystem('input-mapping', {
104104
},
105105

106106
keyboardHandler: function (event) {
107-
var mappings = AFRAME.inputMappings.mappings[AFRAME.currentMapping];
107+
var mappings = AFRAME.inputMappings.mappings[AFRAME.currentInputMapping];
108108

109109
if (mappings && mappings.keyboard) {
110110
mappings = mappings.keyboard;
@@ -172,5 +172,4 @@ AFRAME.registerInputMappings = function (data, override) {
172172
for (var i = 0; i < AFRAME.scenes.length; i++) {
173173
AFRAME.scenes[i].emit('inputmappingregistered');
174174
}
175-
console.log(AFRAME.inputMappings);
176175
};

0 commit comments

Comments
 (0)