From 7e8aea627ac6ee046530011b8a54cba1d854f69d Mon Sep 17 00:00:00 2001 From: 7u83 <7u83@mail.ru> Date: Wed, 19 Dec 2018 19:05:02 +0100 Subject: [PATCH] Some work --- nbproject/project.properties | 2 +- src/opensesim/gui/SeSimApplication.java | 4 ++-- src/opensesim/world/scheduler/Clock.java | 7 ++++--- src/opensesim/world/scheduler/StScheduler.java | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/nbproject/project.properties b/nbproject/project.properties index 07d93c5..41a7766 100644 --- a/nbproject/project.properties +++ b/nbproject/project.properties @@ -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.in.editor=false annotation.processing.processors.list= diff --git a/src/opensesim/gui/SeSimApplication.java b/src/opensesim/gui/SeSimApplication.java index 824f177..6e55fa7 100644 --- a/src/opensesim/gui/SeSimApplication.java +++ b/src/opensesim/gui/SeSimApplication.java @@ -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(); - s.startTimerTask(listener, 1000); + // s.startTimerTask(listener, 1000); /* diff --git a/src/opensesim/world/scheduler/Clock.java b/src/opensesim/world/scheduler/Clock.java index 4f9bf27..6519f6c 100644 --- a/src/opensesim/world/scheduler/Clock.java +++ b/src/opensesim/world/scheduler/Clock.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018, tohe + * Copyright (c) 2018, 7u83 * All rights reserved. * * 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); } - if (t < ct) { + /* if (t < ct) { // System.out.printf("Time is overslipping: %d\n",ct-t); this.current_millis = t; this.current_nanos = this.current_millis * 1000000.0; - } + }*/ + return 0; } diff --git a/src/opensesim/world/scheduler/StScheduler.java b/src/opensesim/world/scheduler/StScheduler.java index 5a61387..b70fc39 100644 --- a/src/opensesim/world/scheduler/StScheduler.java +++ b/src/opensesim/world/scheduler/StScheduler.java @@ -274,7 +274,7 @@ public class StScheduler extends Thread { long t = event_queue.firstKey(); 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) return delay;