toxiclibs 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 946268fb6e50b2556be590d1cf0b733f3915e31c98b19e436ec50bd872006a41
-  data.tar.gz: '09522b131b7f1b8047dce50b62e39f8b7795383c028155e0d7236ef4baeb419c'
+  metadata.gz: ea1e1885aff507b0bb35cf61ddab9b086553d07b35be64e3b1673cbacc7846ce
+  data.tar.gz: dc1955313145c89dafbe4ace7b55d15af37f0d6fafee423a3a700e423ed14fca
 SHA512:
-  metadata.gz: c86c4b5dd436f79bed4d9ba21ca7c2f14e822e13a7eeeabdab677b0b93f67ce8d4b3da915632a9cafa29fddb0720be53f5c19ff253bbcbce55b6ca9b4b0bc94f
-  data.tar.gz: 13a197bc603117f7a863b2d32d658aae44d23080f5b4cd1fddd490706ec66739c91ad57efa87020f00546ff55431423482376b658fff905eac713913b9533152
+  metadata.gz: 466378a7a6896aad508c6de8928253695fa891aca794a90906e9481021195f556cd42363a79f50bf33e4d9c7dd4e65ff4ab7d4dd48f4a54acd8696abaae76a84
+  data.tar.gz: c1b115629d788cc547cc37fedeb07406c9f55d572f4553bc842bc7b07aa00cbf5b17a961fd523463924adca4e593273248bb9f072e8cc3c3d2de3a50058cb27e

data/.mvn/extensions.xml

@@ -3,6 +3,6 @@
   <extension>
     <groupId>io.takari.polyglot</groupId>
     <artifactId>polyglot-ruby</artifactId>
-    <version>0.4.0</version>
+    <version>0.4.6</version>
   </extension>
 </extensions>

data/CHANGELOG.md

@@ -1,3 +1,5 @@
+**v2.1.0** Add module-info.
+
 **v2.0.0** Bump to target minimum of jdk11 thus removing JAXB annotations (possibly esoteric and underused anyway).
 
 **v1.0.1** Bump processing to 3.4, support toxiclibs Voronoi etc

data/README.md

@@ -8,7 +8,7 @@
 gem install toxiclibs
 ```
 
-### NB: Use version 0.4 for ruby-processing, and 1.0.0+ for propane and JRubyArt
+### NB: Use version 0.4 for ruby-processing, and 2.1.0+ for propane, PiCrate and JRubyArt
 
 NB: Build is only failing because current version of processing is not available at maven central.
 This gem provides Karsten Schmidts (aka toxi, @postspectacular) toxiclibs jars for JRubyArt. To compile the gem follow the instructions for [JRubyArt][]. Most parts of toxiclibs API is exposed in the latest version, (but only a few examples are included) in principle it should be possible to make all available!!! For this demonstration I have used up to date source code for version 21, since [toxis final release][] has not yet been released (although [Dan Shiffman][] has released a version for processing-3.0+). There are reported to be number of outstanding bugs with toxiclibs, if they affect you report it [here][] (or better fix them yourself and submit a pull request).

data/Rakefile

@@ -18,7 +18,7 @@ end
 
 desc 'Build gem'
 task :gem do
-  sh "gem build toxiclibs.gemspec" 
+  sh "jgem build toxiclibs.gemspec" 
 end
 
 desc 'Compile'

data/lib/toxiclibs/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 # wrapper to give version a meaningful name
 module Toxiclibs
-  VERSION = '2.0.0'.freeze
+  VERSION = '2.1.0'.freeze
 end

data/pom.rb

@@ -1,7 +1,7 @@
 project 'toxiclibs' do
 
   model_version '4.0.0'
-  id 'ruby-processing:toxiclibs:2.0.0'
+  id 'ruby-processing:toxiclibs:2.1.0'
   packaging 'jar'
 
   description 'toxiclibs-library for JRubyArt'
@@ -22,21 +22,17 @@ project 'toxiclibs' do
               'polyglot.dump.pom' => 'pom.xml',
               'project.build.sourceEncoding' => 'UTF-8',
               'target.release' => '11',
-              'polyglot.dump.pom' => 'pom.xml'
+              'polyglot.dump.pom' => 'pom.xml',
+              'maven.deploy.skip' => 'true'
             )
 
-  jar 'org.processing:core:3.3.7'
+  jar 'org.processing:core:4.0.0'
 
   overrides do
     plugin( :compiler, '3.8.1',
             'release' =>  '11' )
     plugin :javadoc, '2.10.4'
-    plugin(
-      :jar, '3.2.0',
-      'archive' => {
-        'manifestFile' =>  'MANIFEST.MF'
-      }
-    )
+    plugin :jar, '3.2.0'
     plugin :jdeps, '3.1.2' do
       execute_goals 'jdkinternals', 'test-jdkinternals'
     end

data/pom.xml

@@ -2,7 +2,7 @@
 <!--
 
 
-DO NOT MODIFIY - GENERATED CODE
+DO NOT MODIFY - GENERATED CODE
 
 
 -->
@@ -11,7 +11,7 @@ DO NOT MODIFIY - GENERATED CODE
   <modelVersion>4.0.0</modelVersion>
   <groupId>ruby-processing</groupId>
   <artifactId>toxiclibs</artifactId>
-  <version>2.0.0</version>
+  <version>2.1.0</version>
   <name>toxiclibs</name>
   <description>toxiclibs-library for JRubyArt</description>
   <developers>
@@ -34,6 +34,7 @@ DO NOT MODIFIY - GENERATED CODE
     <url>https://github.com/ruby-processing/toxiclibs/issues</url>
   </issueManagement>
   <properties>
+    <maven.deploy.skip>true</maven.deploy.skip>
     <polyglot.dump.pom>pom.xml</polyglot.dump.pom>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <source.directory>src</source.directory>
@@ -43,7 +44,7 @@ DO NOT MODIFIY - GENERATED CODE
     <dependency>
       <groupId>org.processing</groupId>
       <artifactId>core</artifactId>
-      <version>3.3.7</version>
+      <version>4.0.0</version>
     </dependency>
   </dependencies>
   <build>
@@ -66,11 +67,6 @@ DO NOT MODIFIY - GENERATED CODE
         <plugin>
           <artifactId>maven-jar-plugin</artifactId>
           <version>3.2.0</version>
-          <configuration>
-            <archive>
-              <manifestFile>MANIFEST.MF</manifestFile>
-            </archive>
-          </configuration>
         </plugin>
         <plugin>
           <artifactId>maven-jdeps-plugin</artifactId>

data/src/main/java/module-info.java

@@ -0,0 +1,22 @@
+module toxiclibs{
+  exports toxi.color;
+  exports toxi.data.csv;
+  exports toxi.data.feeds;
+  exports toxi.geom;
+  exports toxi.image.util;
+  exports toxi.music.scale;
+  exports toxi.newmesh;
+  exports toxi.physics2d;
+  exports toxi.physics3d;
+  exports toxi.processing;
+  exports toxi.sim.automata;
+  exports toxi.sim.dla;
+  exports toxi.sim.erosion;
+  exports toxi.sim.fluids;
+  exports toxi.sim.grayscott;
+  exports toxi.util;
+  exports toxi.volume;
+  requires org.processing.core;
+  requires java.desktop;
+  requires java.logging;
+}

data/src/test/java/module-info.java

@@ -0,0 +1,10 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+module ToxiclibsTest {
+    requires org.processing.core;
+    requires toxiclibs;
+}

data/src/test/java/{BooleanShapes.java → toxi/BooleanShapes.java}

@@ -1,4 +1,4 @@
-
+package toxi;
 import processing.core.*;
 
 import toxi.geom.*;
@@ -56,7 +56,7 @@ public class BooleanShapes extends PApplet {
     }
 
     static public void main(String[] passedArgs) {
-        String[] appletArgs = new String[]{"BooleanShapes"};
+        String[] appletArgs = new String[]{"toxi.BooleanShapes"};
         if (passedArgs != null) {
             PApplet.main(concat(appletArgs, passedArgs));
         } else {

metadata

@@ -1,18 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: toxiclibs
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Karsten Schmidt
 - Martin Prout
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-03 00:00:00.000000000 Z
+date: 2021-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -21,8 +20,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 12.3.0
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
@@ -31,8 +31,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 12.3.0
-description: "  Toxiclibs java libraries wrapped in a rubygem. Compiled and tested
-  with JRubyArt-2.4 and processing-3.4\n"
+description: "  Toxiclibs java libraries wrapped in a rubygem. Compiled and tested\
+  \ with JRubyArt-2.4 and processing-3.4\n"
 email: mamba2928@yahoo.co.uk
 executables: []
 extensions: []
@@ -86,16 +86,7 @@ files:
 - lib/toxiclibs/version.rb
 - pom.rb
 - pom.xml
-- src/com/toxi/net/ClientListener.java
-- src/com/toxi/net/ServerListener.java
-- src/com/toxi/net/ServerListenerAdapter.java
-- src/com/toxi/net/ServerState.java
-- src/com/toxi/net/UDPConnection.java
-- src/com/toxi/net/UDPSyncClient.java
-- src/com/toxi/net/UDPSyncServer.java
-- src/com/toxi/nio/UDPClient.java
-- src/com/toxi/nio/UDPClientState.java
-- src/com/toxi/nio/UDPServer.java
+- src/main/java/module-info.java
 - src/main/java/toxi/color/AccessCriteria.java
 - src/main/java/toxi/color/AlphaAccessor.java
 - src/main/java/toxi/color/CMYKAccessor.java
@@ -435,14 +426,15 @@ files:
 - src/main/java/toxi/volume/VolumetricHashMap.java
 - src/main/java/toxi/volume/VolumetricSpace.java
 - src/main/java/toxi/volume/VolumetricSpaceArray.java
-- src/test/java/BooleanShapes.java
+- src/test/java/module-info.java
+- src/test/java/toxi/BooleanShapes.java
 - toxiclibs.gemspec
 homepage: http://ruby-processing.github.io/toxicgem/
 licenses:
 - MIT
 - LGPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -457,8 +449,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.14
+signing_key:
 specification_version: 4
 summary: Updated and extended toxiclibs libraries for JRubyArt and propane
 test_files: []

data/src/com/toxi/net/ClientListener.java

@@ -1,41 +0,0 @@
-package com.toxi.net;
-
-/**
- *
- * @author tux
- */
-public interface ClientListener {
-    /**
-     * Callback to trigger an update of the server managed process. This might
-     * be called several times in a row if the client has fallen behind in time.
-     * There should be NO rendering related tasks being called from this
-     * callback.
-     */
-    public void triggerUpdate();
-
-    /**
-     * Callback to trigger the rendering of a new frame. This method will ALWAYS
-     * be called after {{@link #triggerUpdate()} and should be purely focused on
-     * drawing/rendering specific tasks, but no CPU intensive model updates.
-     */
-    public void triggerFrame();
-
-    /**
-     * Callback to confirm client has successfully connected
-     */
-    public void notifyConnected();
-
-    /**
-     * Callback to notify client has disconnected from the server.
-     */
-    public void notifyDisconnected();
-
-    /**
-     * Callback to give the client a chance to react to the encountered
-     * exception.
-     * 
-     * @param e
-     *            the exception which caused the callback
-     */
-    public void handleError(Exception e);
-}

data/src/com/toxi/net/ServerListener.java

@@ -1,70 +0,0 @@
-package com.toxi.net;
-
-import java.net.DatagramPacket;
-
-/**
- *
- * @author tux
- */
-public interface ServerListener {
-
-    /**
-     * Notifies listener immediately after the server socket has been created.
-     */
-    public void serverStarted();
-
-    /**
-     * Notifies the listener server is shutting down.
-     */
-    public void serverShutdown();
-
-    /**
-     * Gives listener a chance to react to any fatal server errors.
-     * 
-     * @param e
-     */
-    public void serverError(Exception e);
-
-    /**
-     * Notifies the listener of a new server state. The state info itself is
-     * attached.
-     * 
-     * @param s
-     */
-    public void serverStateChanged(ServerState s);
-
-    /**
-     * Notifies listener of a new client connection. Details are attached.
-     * 
-     * @param conn
-     */
-    public void clientConnected(UDPConnection conn);
-
-    /**
-     * Notifies listener a client has disconnected. Connection details are
-     * attached.
-     * 
-     * @param conn
-     */
-    public void clientDisconnected(UDPConnection conn);
-
-    /**
-     * Notifies and forwards received client data to the listener for further
-     * analysis.
-     * 
-     * @param conn
-     *            client connection details
-     * @param receivePacket
-     *            data sent by the client
-     */
-    public void clientUpdated(UDPConnection conn, DatagramPacket receivePacket);
-
-    /**
-     * Gives the listener a chance to add extra data to the payload packet
-     * distributed to each client.
-     * 
-     * @return additional data, or null if none required
-     */
-    public byte[] getSyncPayload();
-
-}

data/src/com/toxi/net/ServerListenerAdapter.java

@@ -1,47 +0,0 @@
-/**
- * 
- */
-package com.toxi.net;
-
-import java.net.DatagramPacket;
-
-/**
- * @author toxi
- * 
- */
-public class ServerListenerAdapter implements ServerListener {
-
-    @Override
-    public void clientConnected(UDPConnection conn) {
-
-    }
-
-    @Override
-    public void clientDisconnected(UDPConnection conn) {
-    }
-
-    @Override
-    public void clientUpdated(UDPConnection conn, DatagramPacket receivePacket) {
-    }
-
-    @Override
-    public byte[] getSyncPayload() {
-        return new byte[0];
-    }
-
-    @Override
-    public void serverError(Exception e) {
-    }
-
-    @Override
-    public void serverShutdown() {
-    }
-
-    @Override
-    public void serverStarted() {
-    }
-
-    @Override
-    public void serverStateChanged(ServerState s) {
-    }
-}

data/src/com/toxi/net/ServerState.java

@@ -1,18 +0,0 @@
-package com.toxi.net;
-
-/**
- *
- * @author tux
- */
-public enum ServerState {
-
-    /**
-     *
-     */
-    WAITING_FOR_CLIENTS,
-
-    /**
-     *
-     */
-    SYNCHING
-}

data/src/com/toxi/net/UDPConnection.java

@@ -1,66 +0,0 @@
-package com.toxi.net;
-
-import java.io.*;
-import java.net.*;
-
-/**
- * @author Karsten Schmidt <info@postspectacular.com>
- */
-
-class UDPConnection {
-
-    /**
-     * Default time-to-live duration
-     */
-    static int TTL = 10000;
-
-    protected InetAddress ip;
-    protected int port;
-
-    protected long lastUpdate;
-
-    UDPConnection(InetAddress ip, int port) {
-        this.ip = ip;
-        this.port = port;
-        lastUpdate = System.currentTimeMillis();
-    }
-
-    public boolean isAlive() {
-        return System.currentTimeMillis() - lastUpdate < TTL;
-    }
-
-    public void update() {
-        lastUpdate = System.currentTimeMillis();
-    }
-
-    public void send(DatagramSocket socket, byte[] data) throws IOException {
-        DatagramPacket sendPacket = new DatagramPacket(data, data.length, ip,
-                port);
-        socket.send(sendPacket);
-    }
-
-    public InetAddress getIP() {
-        return ip;
-    }
-
-    public int getPort() {
-        return port;
-    }
-
-    public long getLastUpdate() {
-        return lastUpdate;
-    }
-
-    @Override
-    public String toString() {
-        return UDPConnection.buildHash(ip, port);
-    }
-
-    static final void setTTL(int ttl) {
-        TTL = ttl;
-    }
-
-    public static final String buildHash(InetAddress ip, int port) {
-        return ip.getHostAddress() + ":" + port;
-    }
-}

data/src/com/toxi/net/UDPSyncClient.java

@@ -1,81 +0,0 @@
-package com.toxi.net;
-
-import java.io.IOException;
-import java.net.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-class UDPSyncClient extends Thread {
-    private ClientListener listener;
-
-    protected String serverName;
-    protected int port;
-    protected int clientID;
-    protected int ttl;
-
-    private int frameCount;
-    protected long lastUpdate;
-
-    private static final Logger logger = Logger.getLogger(UDPSyncClient.class
-            .getName());
-
-    UDPSyncClient(String serverName, int port, int clientID, int ttl) {
-        this.serverName = serverName;
-        this.port = port;
-        this.clientID = clientID;
-        this.ttl = ttl;
-    }
-
-    @Override
-    public void run() {
-        DatagramSocket clientSocket = null;
-        lastUpdate = System.currentTimeMillis();
-        try {
-            clientSocket = new DatagramSocket();
-            InetAddress ip = InetAddress.getByName(serverName);
-            byte[] sendData = new byte[] { 1 };
-            byte[] receiveData = new byte[8];
-            // do initial sign on by sending a message to the server
-            DatagramPacket sendPacket = new DatagramPacket(sendData,
-                    sendData.length, ip, port);
-            clientSocket.send(sendPacket);
-            while (true) {
-                DatagramPacket receivePacket = new DatagramPacket(receiveData,
-                        receiveData.length);
-                clientSocket.receive(receivePacket);
-                String payload = new String(receivePacket.getData(), 0,
-                        receivePacket.getLength());
-                if (logger != null)
-                    logger.finest(payload);
-                int newFrameCount = Integer.parseInt(payload);
-                if (newFrameCount > 0) {
-                    while (frameCount < newFrameCount) {
-                        if (listener != null)
-                            listener.triggerUpdate();
-                        frameCount++;
-                    }
-                }
-                if (listener != null)
-                    listener.triggerFrame();
-                long now = System.currentTimeMillis();
-                if (now - lastUpdate > ttl) {
-                    sendPacket = new DatagramPacket(sendData, sendData.length,
-                            ip, port);
-                    clientSocket.send(sendPacket);
-                    lastUpdate = now;
-                    if (logger != null)
-                        logger.log(Level.FINER, "TTL updated on: {0}", lastUpdate);
-                }
-            }
-        } catch (IOException | NumberFormatException ex) {
-            logger.log(Level.SEVERE, null, ex);
-        } finally {
-            if (clientSocket != null)
-                clientSocket.close();
-        }
-    }
-
-    public void setListener(ClientListener l) {
-        listener = l;
-    }
-}

data/src/com/toxi/net/UDPSyncServer.java

@@ -1,450 +0,0 @@
-package com.toxi.net;
-
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.net.DatagramPacket;
-import java.net.DatagramSocket;
-import java.net.InetAddress;
-import java.net.SocketTimeoutException;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.logging.ConsoleHandler;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.kohsuke.args4j.CmdLineException;
-import org.kohsuke.args4j.CmdLineParser;
-import org.kohsuke.args4j.Option;
-
-import toxi.util.datatypes.TypedProperties;
-
-/**
- * <p>
- * An <a href="http://mostpixelsever.com">MPE</a> inspired synch server for
- * networked multi-screen applications. All communication is realised via UDP.
- * Clients are not requested to acknowledge every single packet received, but
- * need to send a heart beat in a regular (configurable) interval. The server
- * discards any data received from clients, so it doesn't matter what is being
- * sent back. A single byte will suffice.
- * </p>
- * 
- * <p>
- * The server can be configured via CLI arguments and/or Java property files and
- * can be connected to an existing logger. When run on from the commandline a
- * console logger is automatically added.
- * </p>
- * 
- * @author Karsten Schmidt <info@postspectacular.com>
- */
-public class UDPSyncServer {
-
-    private static final int DEFAULT_RECEIVE_PACKET_SIZE = 32;
-
-    private static final int DEFAULT_NUM_CLIENTS = 1;
-
-    private static final int DEFAULT_FRAMERATE = 30;
-
-    private static final int DEFAULT_PORT = 9002;
-
-    private static final int DEFAULT_RECEIVE_TIMEOUT = 1;
-
-    private ServerState state;
-
-    DatagramSocket socket;
-    HashMap<String, UDPConnection> connections = new HashMap<>();
-
-    /**
-     *
-     */
-    @Option(name = "-port", aliases = "-p", usage = "server socket port number")
-    protected int port = DEFAULT_PORT;
-
-    @Option(name = "-config", aliases = "-c", usage = "path to configuration file", metaVar = "PATH")
-    private String configFile;
-    private TypedProperties config;
-
-    @Option(name = "-packetsize", aliases = "-s", usage = "receive packet size")
-    private int receivePacketSize = DEFAULT_RECEIVE_PACKET_SIZE;
-    private byte[] receiveData;
-
-    /**
-     *
-     */
-    @Option(name = "-rectimeout", aliases = "-rt", usage = "receive timeout (in ms), minimum 1ms")
-    protected int receiveTimeOut = DEFAULT_RECEIVE_TIMEOUT;
-
-    /**
-     *
-     */
-    @Option(name = "-ttl", usage = "client time-to-live, max. time interval after which clients expire")
-    protected int connectionTimeOut = UDPConnection.TTL;
-
-    /**
-     *
-     */
-    @Option(name = "-numclients", aliases = "-num", usage = "number of clients")
-    protected int numClients = DEFAULT_NUM_CLIENTS;
-
-    /**
-     *
-     */
-    @Option(name = "-framerate", aliases = "-fps", usage = "target framerate")
-    protected int frameRate = DEFAULT_FRAMERATE;
-
-    /**
-     *
-     */
-    protected int frameDuration;
-
-    /**
-     *
-     */
-    protected int frameCount;
-
-    private static Logger LOGGER;
-
-    /**
-     * Optional server event listener
-     */
-    protected ServerListener listener;
-
-    /**
-     *
-     */
-    public UDPSyncServer() {
-        config = new TypedProperties();
-        setMaxReceivePacketSize(DEFAULT_RECEIVE_PACKET_SIZE);
-    }
-
-    /**
-     *
-     * @param args
-     */
-    public static void main(String args[]) {
-        new UDPSyncServer().execute(args);
-    }
-
-    /**
-     * Main entry point for CLI.
-     * 
-     * @param args
-     *            command line arguments
-     */
-    public void execute(String[] args) {
-        CmdLineParser parser = new CmdLineParser(this);
-        parser.setUsageWidth(80);
-        try {
-            parser.parseArgument(args);
-        } catch (CmdLineException e) {
-            System.err.println(e.getMessage());
-            System.err.println("java UDPSyncServer [options]");
-            parser.printUsage(System.err);
-            System.err.println();
-            return;
-        }
-
-        try {
-            if (configFile != null)
-                config.load(new FileInputStream(configFile));
-            LOGGER = Logger.getLogger("com.postspectacular");
-            LOGGER.addHandler(new ConsoleHandler());
-            LOGGER.setLevel(Level.CONFIG);
-            configure(config);
-            run();
-        } catch (FileNotFoundException e) {
-            System.err.println("cannot find config file @ " + args[0]);
-        } catch (IOException e) {
-            System.err.println("cannot read config file @ " + args[0]);
-        }
-    }
-
-    /**
-     * Configures the server with settings using the passed-in properties.
-     * 
-     * @param config
-     */
-    public void configure(TypedProperties config) {
-        this.config = config;
-        port = config.getInt("server.port", port);
-        setMaxReceivePacketSize(config.getInt("udp.packetsize",
-                receivePacketSize));
-        numClients = config.getInt("server.numclients", numClients);
-        frameRate = config.getInt("server.framerate", frameRate);
-        frameDuration = 1000 / frameRate;
-        connectionTimeOut = config.getInt("udp.ttl", connectionTimeOut);
-        UDPConnection.setTTL(connectionTimeOut);
-        receiveTimeOut = config.getInt("udp.receivetimeout", receiveTimeOut);
-        if (LOGGER != null) {
-            LOGGER.log(Level.INFO, "configured server... port:{0} clients:{1} fps:{2} ttl:{3} rto:{4}", new Object[]{port, numClients, frameRate, connectionTimeOut, receiveTimeOut});
-        }
-        setState(ServerState.WAITING_FOR_CLIENTS);
-    }
-
-    /**
-     * Main server loop/state machine. Creates socket and handles syncing of
-     * connected clients.
-     */
-    public void run() {
-        try {
-            socket = new DatagramSocket(port);
-            if (LOGGER != null)
-                LOGGER.log(Level.INFO, "creating socket @ port {0}", port);
-            if (listener != null) {
-                listener.serverStarted();
-            }
-            while (true) {
-                switch (state) {
-
-                    case WAITING_FOR_CLIENTS:
-                        if (LOGGER != null)
-                            LOGGER.info("Server running, waiting for connections...");
-                        // disable timeout, i.e socket will block indefinitely
-                        // until
-                        // a packet is received
-                        socket.setSoTimeout(0);
-                        while (connections.size() < numClients) {
-                            receiveAndAddConnection();
-                        }
-                        // all connected, start syncing...
-                        setState(ServerState.SYNCHING);
-                        break;
-
-                    case SYNCHING:
-                        socket.setSoTimeout(receiveTimeOut);
-                        if (connections.size() > 0) {
-                            doHeartBeat();
-                            byte[] payload = getSyncPayload();
-                            Iterator<UDPConnection> iter = connections.values()
-                                    .iterator();
-                            // Uses nanoTime for better precision / more stable
-                            // framerate, but unavailable on OSX!!!
-                            long beginSynch = System.nanoTime();
-                            while (iter.hasNext()) {
-                                UDPConnection conn = iter.next();
-                                if (!conn.isAlive()) {
-                                    iter.remove();
-                                    if (LOGGER != null)
-                                        LOGGER.log(Level.WARNING, "{0} disconnected", conn);
-                                    if (listener != null)
-                                        listener.clientDisconnected(conn);
-                                }
-                                conn.send(socket, payload);
-                            }
-                            int returnCount = 0;
-                            while (returnCount < numClients
-                                    && returnCount < connections.size() + 1) {
-                                try {
-                                    DatagramPacket receivePacket = new DatagramPacket(
-                                            receiveData, receiveData.length);
-                                    socket.receive(receivePacket);
-                                    InetAddress ip = receivePacket.getAddress();
-                                    int portDP = receivePacket.getPort();
-                                    String connID = UDPConnection.buildHash(ip,
-                                            portDP);
-                                    UDPConnection conn = connections
-                                            .get(connID);
-                                    if (conn != null) {
-                                        conn.update();
-                                        returnCount++;
-                                    } else {
-                                        // renewed connection
-                                        conn = new UDPConnection(ip, portDP);
-                                        conn.send(socket, getSyncPayload());
-                                        connections.put(connID, conn);
-                                        if (LOGGER != null)
-                                            LOGGER.log(Level.FINE, "re-adding connection: {0}", conn);
-                                    }
-                                    if (listener != null)
-                                        listener.clientUpdated(conn,
-                                                receivePacket);
-                                } catch (SocketTimeoutException e) {
-                                    // no further packets available
-                                    break;
-                                }
-                            }
-                            long endSynch = System.nanoTime();
-                            long delta = (endSynch - beginSynch) / 1000000;
-                            if (delta < frameDuration) {
-                                int sleep = frameDuration - (int) delta;
-                                if (LOGGER != null)
-                                    LOGGER.log(Level.FINEST, "sleeping: {0}", sleep);
-                                Thread.sleep(sleep);
-                            }
-                        } else {
-                            if (LOGGER != null)
-                                LOGGER.info("all clients disconnected");
-                            setState(ServerState.WAITING_FOR_CLIENTS);
-                        }
-                }
-            }
-        } catch (IOException | InterruptedException e) {
-            handleException(e);
-        } finally {
-            if (LOGGER != null)
-                LOGGER.info("server shutting down...");
-            if (socket != null)
-                socket.close();
-        }
-    }
-
-    /**
-     * Attempts to receive data sent from clients to confirm they're still
-     * connected. The timeout for this action is set to 1ms by default, so
-     * currently not more than 25 machines can be reliably connected & synched
-     * at 25fps.
-     * 
-     * If a connection times out it's removed from the list of active clients.
-     * On the other hand if a new connection hash is found we know a client has
-     * reconnected and will be added back to the pool.
-     */
-    protected void receiveAndAddConnection() {
-        try {
-            DatagramPacket receivePacket = new DatagramPacket(receiveData,
-                    receiveData.length);
-            if (LOGGER != null)
-                LOGGER.log(Level.INFO, "waiting for {0} more clients to reconnect...", (numClients - connections.size()));
-            socket.receive(receivePacket);
-            InetAddress ip = receivePacket.getAddress();
-            int portDP = receivePacket.getPort();
-            String connID = UDPConnection.buildHash(ip, portDP);
-            if (connections.get(connID) == null) {
-                if (connections.isEmpty()) {
-                    frameCount = 0;
-                    if (LOGGER != null)
-                        LOGGER.info("resetting frame count");
-                }
-                UDPConnection conn = new UDPConnection(ip, portDP);
-                connections.put(connID, conn);
-                conn.send(socket, getSyncPayload());
-                if (LOGGER != null)
-                    LOGGER.log(Level.FINE, "added new connection: {0}", conn);
-                if (listener != null) {
-                    listener.clientConnected(conn);
-                }
-            }
-        } catch (SocketTimeoutException e) {
-        } catch (IOException e) {
-            handleException(e);
-        }
-    }
-
-    private void handleException(Exception e) {
-        if (listener != null)
-            listener.serverError(e);
-        if (LOGGER != null)
-            LOGGER.log(Level.SEVERE, "Server error", e);
-        else
-            e.printStackTrace();
-    }
-
-    /**
-     * Updates the internal state of the heartbeat info sent out later.
-     */
-    protected void doHeartBeat() {
-        frameCount++;
-    }
-
-    /**
-     * Collects and formats payload data sent via UDP to all clients. By default
-     * only the current frame number is sent. If more data is required you can
-     * either overwrite this method or append data via an attached
-     * {@link ServerListener}.
-     * 
-     * @return payload data as byte array
-     */
-    protected byte[] getSyncPayload() {
-        StringBuilder sb = new StringBuilder();
-        sb.append(frameCount);
-        byte[] defaultPayload = sb.toString().getBytes();
-        if (listener != null) {
-            byte[] userPayload = listener.getSyncPayload();
-            if (userPayload != null) {
-                byte[] combinedPayload = new byte[defaultPayload.length
-                        + userPayload.length];
-                System.arraycopy(defaultPayload, 0, combinedPayload, 0,
-                        defaultPayload.length);
-                System.arraycopy(userPayload, 0, combinedPayload,
-                        defaultPayload.length, userPayload.length);
-                return combinedPayload;
-            }
-        }
-        return defaultPayload;
-    }
-
-    /**
-     * Triggers and logs a new server state. If present, this will also notify
-     * the {@link ServerListener}.
-     * 
-     * @param s
-     *            new server state
-     */
-    private void setState(ServerState s) {
-        state = s;
-        if (LOGGER != null)
-            LOGGER.log(Level.CONFIG, "new server state: {0}", state);
-        if (listener != null)
-            listener.serverStateChanged(s);
-    }
-
-    /**
-     * @return Maximum size of UDP packets the server is able to receive
-     */
-    public int getMaxPacketSize() {
-        return receiveData.length;
-    }
-
-    /**
-     * Sets the max. size of UDP packets the server is able to receive
-     * 
-     * @param size
-     */
-    public final void setMaxReceivePacketSize(int size) {
-        receivePacketSize = size;
-        if (receiveData == null) {
-            receiveData = new byte[size];
-        } else if (receiveData.length != size) {
-            synchronized (receiveData) {
-                receiveData = new byte[size];
-            }
-        }
-    }
-
-    /**
-     * @return configured number of clients the server is expecting and
-     *         initially waiting for to connect before any syncing begins.
-     */
-    public int getNumClients() {
-        return numClients;
-    }
-
-    /**
-     * Sets the number of clients the server is expecting and initially waiting
-     * for to connect before any syncing begins.
-     * 
-     * @param numClients
-     */
-    public void setNumClients(int numClients) {
-        this.numClients = numClients;
-    }
-
-    /**
-     * Attaches a logger to the server.
-     * 
-     * @param logger
-     */
-    public void setLogger(Logger logger) {
-        UDPSyncServer.LOGGER = logger;
-    }
-
-    /**
-     * Attaches an event listener to the server.
-     * 
-     * @param listener
-     */
-    public void setListener(ServerListener listener) {
-        this.listener = listener;
-        if (LOGGER != null)
-            LOGGER.log(Level.INFO, "new server listener: {0}", listener);
-    }
-}

data/src/com/toxi/nio/UDPClient.java

@@ -1,121 +0,0 @@
-package com.toxi.nio;
-
-import java.net.*;
-import java.io.*;
-import java.nio.*;
-import java.nio.channels.*;
-import java.nio.channels.spi.SelectorProvider;
-import java.util.*;
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-/**
- *
- * @author tux
- */
-public class UDPClient {
-
-    /**
-     *
-     */
-    public final static int DEFAULT_PORT = 9876;
-
-    int port = DEFAULT_PORT;
-    SocketAddress remote;
-    DatagramChannel channel;
-    Selector selector;
-    ByteBuffer buffer1;
-    ByteBuffer buffer2;
-
-    int clientID;
-
-    /**
-     *
-     * @param clientID
-     */
-    public UDPClient(int clientID) {
-        this.clientID = clientID;
-        System.out.println("new client ID: " + clientID);
-        try {
-            remote = new InetSocketAddress("192.168.1.64", port);
-            channel = DatagramChannel.open();
-            channel.configureBlocking(false);
-            channel.connect(remote);
-            selector = SelectorProvider.provider().openSelector();
-            channel.register(selector, SelectionKey.OP_READ
-                    | SelectionKey.OP_WRITE);
-            buffer1 = ByteBuffer.allocate(4);
-            buffer2 = ByteBuffer.allocate(4);
-        } catch (IOException ex) {
-            System.err.println(ex);
-        }
-    }
-
-    /**
-     *
-     * @param command
-     */
-    public void send(int command) {
-        try {
-            selector.select(clientID);
-            Set readyKeys = selector.selectedKeys();
-            Iterator iterator = readyKeys.iterator();
-            if (iterator.hasNext()) {
-                SelectionKey key = (SelectionKey) iterator.next();
-                iterator.remove();
-                if (key.isWritable()) {
-                    buffer1.clear();
-                    buffer1.putInt(command);
-                    buffer1.flip();
-                    channel.write(buffer1);
-                }
-            }
-        } catch (IOException ex) {
-            System.err.println(ex);
-        }
-    }
-
-    /**
-     *
-     * @return
-     */
-    public int receive() {
-        int r = 0;
-        try {
-            selector.select(clientID);
-            Set readyKeys2 = selector.selectedKeys();
-            Iterator iterator2 = readyKeys2.iterator();
-            if (iterator2.hasNext()) {
-                SelectionKey key2 = (SelectionKey) iterator2.next();
-                iterator2.remove();
-                if (key2.isReadable()) {
-                    buffer2.clear();
-                    channel.read(buffer2);
-                    buffer2.flip();
-                    int command = buffer2.getInt();
-                    r = command;
-                }
-            }
-        } catch (IOException ex) {
-            System.err.println(ex);
-        }
-        return r;
-    }
-
-    /**
-     *
-     * @param args
-     */
-    public static void main(String[] args) {
-        UDPClient client = new UDPClient(Integer.parseInt(args[0]));
-        client.send(1);
-        while (true) {
-            System.out.println(client.receive());
-            try {
-                Thread.sleep(33);
-            } catch (InterruptedException ex) {
-                Logger.getLogger(UDPClient.class.getName()).log(Level.SEVERE, null, ex);
-            }
-        }
-    }
-}

data/src/com/toxi/nio/UDPClientState.java

@@ -1,32 +0,0 @@
-package com.toxi.nio;
-
-import java.net.SocketAddress;
-
-/**
- *
- * @author tux
- */
-public class UDPClientState {
-    SocketAddress addr;
-    boolean isReady;
-    long lastUpdate;
-
-    /**
-     *
-     * @param a
-     */
-    public UDPClientState(SocketAddress a) {
-        addr = a;
-        isReady = true;
-        lastUpdate = System.currentTimeMillis();
-        System.out.println("new client: " + addr);
-    }
-
-    /**
-     *
-     * @return
-     */
-    public SocketAddress getAddress() {
-        return addr;
-    }
-}

data/src/com/toxi/nio/UDPServer.java

@@ -1,129 +0,0 @@
-package com.toxi.nio;
-
-import java.net.*;
-import java.io.*;
-import java.nio.*;
-import java.nio.channels.*;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-/**
- *
- * @author tux
- */
-public class UDPServer extends Thread {
-
-    /**
-     *
-     */
-    public final static int DEFAULT_PORT = 9876;
-
-    /**
-     *
-     */
-    public final static int MAX_PACKET_SIZE = 32;
-
-    private int port;
-    private int packetSize;
-    private int numClients;
-
-    ArrayList<UDPClientState> clients;
-    private int frameCount = 0;
-    private int frameDuration;
-
-    /**
-     *
-     * @param args
-     */
-    public static void main(String[] args) {
-        new UDPServer(1, 25).start();
-        try {
-            while (true) {
-                Thread.sleep(1000);
-                // System.out.println("running.");
-            }
-        } catch (InterruptedException e) {
-            e.printStackTrace();
-        }
-    }
-
-    /**
-     *
-     * @param numClients
-     * @param fps
-     */
-    public UDPServer(int numClients, int fps) {
-        this(DEFAULT_PORT, numClients, MAX_PACKET_SIZE, fps);
-    }
-
-    /**
-     *
-     * @param port
-     * @param numClients
-     * @param maxPacketSize
-     * @param fps
-     */
-    public UDPServer(int port, int numClients, int maxPacketSize, int fps) {
-        this.port = port;
-        this.numClients = numClients;
-        this.packetSize = maxPacketSize;
-        frameDuration = 1000 / fps;
-        clients = new ArrayList<UDPClientState>();
-    }
-
-    /**
-     *
-     */
-    public void run() {
-        DatagramChannel channel = null;
-        DatagramSocket socket = null;
-        ByteBuffer buffer = null;
-        try {
-            channel = DatagramChannel.open();
-            socket = channel.socket();
-            SocketAddress address = new InetSocketAddress(
-                    InetAddress.getLocalHost(), port);
-            socket.bind(address);
-            buffer = ByteBuffer.allocateDirect(packetSize);
-            System.out.println("Server running: " + address);
-            System.out.println("Heartbeat interval: " + frameDuration);
-            System.out.println("waiting for clients...");
-
-            // get the addresses-initialisation phase
-            while (clients.size() < numClients) {
-                clients.add(new UDPClientState(channel.receive(buffer)));
-                buffer.flip();
-                buffer.clear();
-            }
-            // server now knows the clients
-
-            // MAIN LOOP-server is working for the clients
-            while (true) {
-                long beginSynch = System.currentTimeMillis();
-                buffer.clear();
-                buffer.putInt(frameCount++);
-                buffer.flip();
-                Iterator<UDPClientState> iter = clients.iterator();
-                while (iter.hasNext()) {
-                    channel.send(buffer, iter.next().getAddress());
-                }
-                long endSynch = System.currentTimeMillis();
-                if (endSynch - beginSynch < frameDuration) {
-                    int sleep = frameDuration - (int) (endSynch - beginSynch);
-                    // System.out.println("sleeping: " + sleep);
-                    Thread.sleep(sleep);
-                } else {
-                    Thread.sleep(2);
-                }
-            }
-        } catch (Exception ex) {
-            System.err.println(ex);
-        } finally {
-            if (socket != null)
-                socket.close();
-            if (buffer != null)
-                buffer = null;
-            System.out.println("server shutdown.");
-        }
-    }
-}