From c375974a9a88d9484122e358c89b7ea2db5fd98b Mon Sep 17 00:00:00 2001 From: Daniel Johansson Date: Thu, 17 Sep 2015 14:48:02 +0100 Subject: [PATCH] Fixed a compiler error where glfw input classes wanted to use the old LwjglTimer class. --- .../src/main/java/com/jme3/input/lwjgl/GlfwKeyInput.java | 3 +-- .../src/main/java/com/jme3/input/lwjgl/GlfwMouseInput.java | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/jme3-lwjgl3/src/main/java/com/jme3/input/lwjgl/GlfwKeyInput.java b/jme3-lwjgl3/src/main/java/com/jme3/input/lwjgl/GlfwKeyInput.java index 5b7d8e267..20cd07672 100644 --- a/jme3-lwjgl3/src/main/java/com/jme3/input/lwjgl/GlfwKeyInput.java +++ b/jme3-lwjgl3/src/main/java/com/jme3/input/lwjgl/GlfwKeyInput.java @@ -35,7 +35,6 @@ package com.jme3.input.lwjgl; import com.jme3.input.KeyInput; import com.jme3.input.RawInputListener; import com.jme3.input.event.KeyInputEvent; -import com.jme3.system.lwjgl.LwjglTimer; import com.jme3.system.lwjgl.LwjglWindow; import org.lwjgl.glfw.GLFWKeyCallback; @@ -112,6 +111,6 @@ public class GlfwKeyInput implements KeyInput { } public long getInputTimeNanos() { - return (long) (glfwGetTime() * LwjglTimer.LWJGL_TIME_TO_NANOS); + return (long) (glfwGetTime() * 1000000000); } } diff --git a/jme3-lwjgl3/src/main/java/com/jme3/input/lwjgl/GlfwMouseInput.java b/jme3-lwjgl3/src/main/java/com/jme3/input/lwjgl/GlfwMouseInput.java index 41e76a29d..05a2df5db 100644 --- a/jme3-lwjgl3/src/main/java/com/jme3/input/lwjgl/GlfwMouseInput.java +++ b/jme3-lwjgl3/src/main/java/com/jme3/input/lwjgl/GlfwMouseInput.java @@ -37,7 +37,6 @@ import com.jme3.input.MouseInput; import com.jme3.input.RawInputListener; import com.jme3.input.event.MouseButtonEvent; import com.jme3.input.event.MouseMotionEvent; -import com.jme3.system.lwjgl.LwjglTimer; import com.jme3.system.lwjgl.LwjglWindow; import org.lwjgl.glfw.GLFWCursorPosCallback; import org.lwjgl.glfw.GLFWMouseButtonCallback; @@ -183,7 +182,7 @@ public class GlfwMouseInput implements MouseInput { } public long getInputTimeNanos() { - return (long) (glfwGetTime() * LwjglTimer.LWJGL_TIME_TO_NANOS); + return (long) (glfwGetTime() * 1000000000); } public void setNativeCursor(final JmeCursor jmeCursor) {