projects
/
sixth-3d.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Refactoring.
[sixth-3d.git]
/
src
/
main
/
java
/
eu
/
svjatoslav
/
sixth
/
e3d
/
gui
/
humaninput
/
WorldNavigationTracker.java
diff --git
a/src/main/java/eu/svjatoslav/sixth/e3d/gui/humaninput/WorldNavigationTracker.java
b/src/main/java/eu/svjatoslav/sixth/e3d/gui/humaninput/WorldNavigationTracker.java
index
8c37c52
..
28d485c
100644
(file)
--- a/
src/main/java/eu/svjatoslav/sixth/e3d/gui/humaninput/WorldNavigationTracker.java
+++ b/
src/main/java/eu/svjatoslav/sixth/e3d/gui/humaninput/WorldNavigationTracker.java
@@
-1,5
+1,5
@@
/*
/*
- * Sixth 3D engine. Copyright ©2012-201
7
, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ * Sixth 3D engine. Copyright ©2012-201
8
, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 3 of the GNU Lesser General Public License
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of version 3 of the GNU Lesser General Public License
@@
-10,7
+10,7
@@
package eu.svjatoslav.sixth.e3d.gui.humaninput;
import eu.svjatoslav.sixth.e3d.gui.Avatar;
package eu.svjatoslav.sixth.e3d.gui.humaninput;
import eu.svjatoslav.sixth.e3d.gui.Avatar;
-import eu.svjatoslav.sixth.e3d.gui.View
Context
;
+import eu.svjatoslav.sixth.e3d.gui.View
Panel
;
import eu.svjatoslav.sixth.e3d.gui.textEditorComponent.KeyboardHelper;
import java.awt.event.KeyEvent;
import eu.svjatoslav.sixth.e3d.gui.textEditorComponent.KeyboardHelper;
import java.awt.event.KeyEvent;
@@
-18,34
+18,38
@@
import java.awt.event.KeyEvent;
public class WorldNavigationTracker implements UserInputHandler {
@Override
public class WorldNavigationTracker implements UserInputHandler {
@Override
- public boolean before
ViewUpdate(final ViewContext viewContext
,
-
final int millisecondsSinceLastFrame) {
+ public boolean before
Render(final ViewPanel viewPanel
,
+ final int millisecondsSinceLastFrame) {
- trackKeys(millisecondsSinceLastFrame, view
Context
);
+ trackKeys(millisecondsSinceLastFrame, view
Panel
);
return false;
}
@Override
return false;
}
@Override
- public void focusLost(final ViewContext viewContext) {
+ public boolean focusLost(final ViewPanel viewPanel) {
+ return false;
}
@Override
}
@Override
- public void focusReceived(final ViewContext viewContext) {
+ public boolean focusReceived(final ViewPanel viewContext) {
+ return false;
}
@Override
}
@Override
- public void keyPressed(final KeyEvent event, final ViewContext viewContext) {
+ public boolean keyPressed(final KeyEvent event, final ViewPanel viewContext) {
+ return true;
}
@Override
}
@Override
- public void keyReleased(final KeyEvent event, final ViewContext viewContext) {
+ public boolean keyReleased(final KeyEvent event, final ViewPanel viewContext) {
+ return true;
}
/**
* interpret currently pressed keys
*/
public void trackKeys(final long millisecondsSinceLastFrame,
}
/**
* interpret currently pressed keys
*/
public void trackKeys(final long millisecondsSinceLastFrame,
- final View
Context
viewContext) {
+ final View
Panel
viewContext) {
final UserInputTracker inputTracker = viewContext.getUserInputTracker();
final UserInputTracker inputTracker = viewContext.getUserInputTracker();
@@
-56,16
+60,16
@@
public class WorldNavigationTracker implements UserInputHandler {
* (1 + (avatar.getMovementSpeed() / 10));
if (inputTracker.isKeyPressed(KeyboardHelper.UP))
* (1 + (avatar.getMovementSpeed() / 10));
if (inputTracker.isKeyPressed(KeyboardHelper.UP))
- avatar.getMovement
Direction
().z += actualAcceleration;
+ avatar.getMovement
Vector
().z += actualAcceleration;
if (inputTracker.isKeyPressed(KeyboardHelper.DOWN))
if (inputTracker.isKeyPressed(KeyboardHelper.DOWN))
- avatar.getMovement
Direction
().z -= actualAcceleration;
+ avatar.getMovement
Vector
().z -= actualAcceleration;
if (inputTracker.isKeyPressed(KeyboardHelper.RIGHT))
if (inputTracker.isKeyPressed(KeyboardHelper.RIGHT))
- avatar.getMovement
Direction
().x += actualAcceleration;
+ avatar.getMovement
Vector
().x += actualAcceleration;
if (inputTracker.isKeyPressed(KeyboardHelper.LEFT))
if (inputTracker.isKeyPressed(KeyboardHelper.LEFT))
- avatar.getMovement
Direction
().x -= actualAcceleration;
+ avatar.getMovement
Vector
().x -= actualAcceleration;
avatar.enforceSpeedLimit();
}
avatar.enforceSpeedLimit();
}