oops - keyboard events switched
parent
91fbb1bbab
commit
64557daad3
|
@ -1638,7 +1638,7 @@ R3.System.GUI.prototype.buildControl = function(folder, componentTemplate, prope
|
||||||
if (object instanceof R3.D3.Pass.Bloom) {
|
if (object instanceof R3.D3.Pass.Bloom) {
|
||||||
controllers.push(folder.add(object, property, -10, 10, 0.001));
|
controllers.push(folder.add(object, property, -10, 10, 0.001));
|
||||||
} else {
|
} else {
|
||||||
controllers.push(folder.add(object, property, 0, 1000, 0.1));
|
controllers.push(folder.add(object, property, 0, 1000, 0.001));
|
||||||
}
|
}
|
||||||
|
|
||||||
} else if (
|
} else if (
|
||||||
|
|
|
@ -958,7 +958,7 @@ R3.System.Input.prototype.deRegisterMouseControl = function(mouseControl) {
|
||||||
|
|
||||||
R3.System.Input.prototype.onKeyboardKeyUp = function(event) {
|
R3.System.Input.prototype.onKeyboardKeyUp = function(event) {
|
||||||
R3.Event.Emit(
|
R3.Event.Emit(
|
||||||
R3.Event.KEY_DOWN,
|
R3.Event.KEY_UP,
|
||||||
{
|
{
|
||||||
code : event.code || event.key,
|
code : event.code || event.key,
|
||||||
keyCode : event.keyCode
|
keyCode : event.keyCode
|
||||||
|
@ -969,7 +969,7 @@ R3.System.Input.prototype.onKeyboardKeyUp = function(event) {
|
||||||
|
|
||||||
R3.System.Input.prototype.onKeyboardKeyDown = function(event) {
|
R3.System.Input.prototype.onKeyboardKeyDown = function(event) {
|
||||||
R3.Event.Emit(
|
R3.Event.Emit(
|
||||||
R3.Event.KEY_UP,
|
R3.Event.KEY_DOWN,
|
||||||
{
|
{
|
||||||
code : event.code || event.key,
|
code : event.code || event.key,
|
||||||
keyCode : event.keyCode
|
keyCode : event.keyCode
|
||||||
|
|
Loading…
Reference in New Issue