7u83
/
OpenSeSim
1
1
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Some work

This commit is contained in:
7u83 2018-12-19 19:05:02 +01:00
parent 14e80945fb
commit 7e8aea627a
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nbproject/project.properties
View File

@ -1,4 +1,4 @@
#Tue, 18 Dec 2018 19:45:44 +0100 #Wed, 19 Dec 2018 18:53:48 +0100
annotation.processing.enabled=true annotation.processing.enabled=true
annotation.processing.enabled.in.editor=false annotation.processing.enabled.in.editor=false
annotation.processing.processors.list= annotation.processing.processors.list=

4
src/opensesim/gui/SeSimApplication.java
View File

@ -627,10 +627,10 @@ public class SeSimApplication extends javax.swing.JFrame {
} }
MyListener listener = new MyListener(godworld.getWorld()); // MyListener listener = new MyListener(godworld.getWorld());
// MyEvent arg = new MyEvent(); // MyEvent arg = new MyEvent();
s.startTimerTask(listener, 1000); // s.startTimerTask(listener, 1000);
/* /*

7
src/opensesim/world/scheduler/Clock.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2018, tohe * Copyright (c) 2018, 7u83
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * Redistribution and use in source and binary forms, with or without
@ -95,12 +95,13 @@ public class Clock {
return (long) (((double) t - this.current_millis) / this.acceleration); return (long) (((double) t - this.current_millis) / this.acceleration);
} }
if (t < ct) { /* if (t < ct) {
// System.out.printf("Time is overslipping: %d\n",ct-t); // System.out.printf("Time is overslipping: %d\n",ct-t);
this.current_millis = t; this.current_millis = t;
this.current_nanos = this.current_millis * 1000000.0; this.current_nanos = this.current_millis * 1000000.0;
} }*/
return 0; return 0;
} }

2
src/opensesim/world/scheduler/StScheduler.java
View File

@ -274,7 +274,7 @@ public class StScheduler extends Thread {
long t = event_queue.firstKey(); long t = event_queue.firstKey();
long delay = clock.getDelay(t); long delay = clock.getDelay(t);
System.out.printf("Delay is %d %s\n", delay,StScheduler.formatTimeMillis(clock.currentTimeMillis())); // System.out.printf("Delay is %d %s\n", delay,StScheduler.formatTimeMillis(clock.currentTimeMillis()));
if (delay>0) if (delay>0)
return delay; return delay;