Update of /cvsroot/jake2/jake2/src/jake2/sys
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30655/src/jake2/sys
Modified Files:
LWJGLKBD.java JOGLKBD.java Timer.java Sys.java
Log Message:
remove timer hack and use new Timer classes
Index: JOGLKBD.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/sys/JOGLKBD.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** JOGLKBD.java 6 Jun 2005 13:32:06 -0000 1.7
--- JOGLKBD.java 1 Jul 2005 14:20:54 -0000 1.8
***************
*** 210,214 ****
public void Do_Key_Event(int key, boolean down) {
! Key.Event(key, down, Sys.Milliseconds());
}
--- 210,214 ----
public void Do_Key_Event(int key, boolean down) {
! Key.Event(key, down, Timer.Milliseconds());
}
Index: Timer.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/sys/Timer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Timer.java 1 Jul 2005 14:11:01 -0000 1.1
--- Timer.java 1 Jul 2005 14:20:54 -0000 1.2
***************
*** 8,11 ****
--- 8,12 ----
import jake2.Globals;
+ import jake2.qcommon.Com;
***************
*** 27,31 ****
}
}
! System.out.println("using " + t.getClass().getName());
}
--- 28,32 ----
}
}
! Com.Println("using " + t.getClass().getName());
}
Index: LWJGLKBD.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/sys/LWJGLKBD.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** LWJGLKBD.java 7 Jun 2005 08:43:43 -0000 1.9
--- LWJGLKBD.java 1 Jul 2005 14:20:54 -0000 1.10
***************
*** 36,40 ****
mouseHasTwoButtons = (Mouse.getButtonCount() == 2);
! lastRepeat = Sys.Milliseconds();
} catch (Exception e) {;}
}
--- 36,40 ----
mouseHasTwoButtons = (Mouse.getButtonCount() == 2);
! lastRepeat = Timer.Milliseconds();
} catch (Exception e) {;}
}
***************
*** 208,212 ****
public void Do_Key_Event(int key, boolean down) {
! Key.Event(key, down, Sys.Milliseconds());
}
--- 208,212 ----
public void Do_Key_Event(int key, boolean down) {
! Key.Event(key, down, Timer.Milliseconds());
}
Index: Sys.java
===================================================================
RCS file: /cvsroot/jake2/jake2/src/jake2/sys/Sys.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Sys.java 14 Dec 2004 00:11:01 -0000 1.10
--- Sys.java 1 Jul 2005 14:20:54 -0000 1.11
***************
*** 182,190 ****
}
- private static long secbase = System.currentTimeMillis();
-
- public static int Milliseconds() {
- return Globals.curtime = (int) (System.currentTimeMillis() - secbase);
- }
//============================================
--- 182,185 ----
***************
*** 231,235 ****
// grab frame time
! Globals.sys_frame_time = Sys.Milliseconds();
}
--- 226,230 ----
// grab frame time
! Globals.sys_frame_time = Timer.Milliseconds();
}
|
