|
@@ -8,9 +8,9 @@
|
|
this.meshUnderPointer = meshUnderPointer;
|
|
this.meshUnderPointer = meshUnderPointer;
|
|
this.sourceEvent = sourceEvent;
|
|
this.sourceEvent = sourceEvent;
|
|
}
|
|
}
|
|
- ActionEvent.CreateNew = function (source) {
|
|
|
|
|
|
+ ActionEvent.CreateNew = function (source, evt) {
|
|
var scene = source.getScene();
|
|
var scene = source.getScene();
|
|
- return new ActionEvent(source, scene.pointerX, scene.pointerY, scene.meshUnderPointer);
|
|
|
|
|
|
+ return new ActionEvent(source, scene.pointerX, scene.pointerY, scene.meshUnderPointer, event);
|
|
};
|
|
};
|
|
|
|
|
|
ActionEvent.CreateNewFromScene = function (scene, evt) {
|
|
ActionEvent.CreateNewFromScene = function (scene, evt) {
|
|
@@ -202,7 +202,7 @@
|
|
var action = this.actions[index];
|
|
var action = this.actions[index];
|
|
|
|
|
|
if (action.trigger === trigger) {
|
|
if (action.trigger === trigger) {
|
|
- if (trigger == ActionManager.OnKeyUpTrigger || trigger == ActionManager.OnKeyDownTrigger) {
|
|
|
|
|
|
+ if (trigger === ActionManager.OnKeyUpTrigger || trigger === ActionManager.OnKeyDownTrigger) {
|
|
var parameter = action.getTriggerParameter();
|
|
var parameter = action.getTriggerParameter();
|
|
|
|
|
|
if (parameter) {
|
|
if (parameter) {
|