@@ 24,16 24,6 @@ import net.dermetfan.kryonet.box2d.multi
* @since 0.1.0 */
public abstract class Broadcaster {
- /** sends the given Packet to the given Connection via UDP if it is {@link Packet#isOptional() optional} and via TCP otherwise
- * @param packet the Packet to send
- * @param connection the Connection to send the given Packet to */
- public void send(Packet packet, Connection connection) {
- if(packet.isOptional())
- connection.sendUDP(packet);
- else
- connection.sendTCP(packet);
- }
-
/** @param packet the Packet to send */
public abstract void sendToAll(Packet packet);
@@ 120,7 110,7 @@ public abstract class Broadcaster {
@Override
public void sendToAll(Packet packet) {
for(Connection connection : connections)
- send(packet, connection);
+ Packet.Adapter.send(packet, connection);
}
@Override
@@ 29,6 29,7 @@ import com.esotericsoftware.kryonet.List
import net.dermetfan.gdx.physics.box2d.Box2DUtils;
import net.dermetfan.gdx.physics.box2d.WorldObserver;
import net.dermetfan.gdx.utils.DualIntMap;
+import net.dermetfan.kryonet.box2d.multiplayer.packets.Packet;
import net.dermetfan.kryonet.box2d.multiplayer.packets.UpdateProposal;
import net.dermetfan.kryonet.box2d.multiplayer.packets.UpdateRequest;
import net.dermetfan.kryonet.box2d.multiplayer.packets.UpdateRequest.ObjectUpdateRequest;
@@ 181,7 182,7 @@ public class WorldHost extends Listener
trace("WorldHost", "received ObjectUpdateRequest with unknown object hash " + request.getObjectHash() + ", refusing");
Refusal refusal = Pools.obtain(Refusal.class);
refusal.setRequest(request);
- broadcaster.send(refusal, connection);
+ Packet.Adapter.send(refusal, connection);
Pools.free(refusal);
return;
}
@@ 197,7 198,7 @@ public class WorldHost extends Listener
update = creation;
// send the BodyCreation immediately before the following FixtureCreations
update.setObjectHash(request.getObjectHash());
- broadcaster.send(update, connection);
+ Packet.Adapter.send(update, connection);
Pools.free(update);
Array<Fixture> fixtures = body.getFixtureList();
for(int i = 0; i < fixtures.size; i++) { // send a FixtureCreation for each fixture
@@ 206,7 207,7 @@ public class WorldHost extends Listener
fixtureCreation.setObjectHash(index.getKey(fixture, 0));
fixtureCreation.setBodyHash(request.getObjectHash());
fixtureCreation.setFixtureDef(Box2DUtils.createDef(fixture));
- broadcaster.send(fixtureCreation, connection);
+ Packet.Adapter.send(fixtureCreation, connection);
Pools.free(fixtureCreation);
}
return; // do not continue since update was already sent
@@ 237,7 238,7 @@ public class WorldHost extends Listener
update = Pools.obtain(Destruction.class);
assert update != null;
update.setObjectHash(request.getObjectHash());
- broadcaster.send(update, connection);
+ Packet.Adapter.send(update, connection);
Pools.free(update);
}