Merge branch 'cast_receive'

beta.r3js.org
-=yb4f310 2018-01-06 16:48:42 +01:00
commit bec0120f49
5 changed files with 17 additions and 30 deletions

View File

@ -43,7 +43,7 @@ GameLib.API.Socket.Cast = function(
); );
}; };
GameLib.API.Socket.Cast.prototype = Object.create(GameLib.Component.prototype); GameLib.API.Socket.Cast.prototype = Object.create(GameLib.API.Socket.prototype);
GameLib.API.Socket.Cast.prototype.constructor = GameLib.API.Socket.Cast.Receive; GameLib.API.Socket.Cast.prototype.constructor = GameLib.API.Socket.Cast.Receive;
GameLib.API.Socket.Cast.CAST_TYPE_ROOM = 0x1; GameLib.API.Socket.Cast.CAST_TYPE_ROOM = 0x1;

View File

@ -43,13 +43,12 @@ GameLib.API.Socket.Receive = function(
); );
}; };
GameLib.API.Socket.Receive.prototype = Object.create(GameLib.Component.prototype); GameLib.API.Socket.Receive.prototype = Object.create(GameLib.API.Socket.prototype);
GameLib.API.Socket.Receive.prototype.constructor = GameLib.API.Socket.Receive; GameLib.API.Socket.Receive.prototype.constructor = GameLib.API.Socket.Receive;
GameLib.API.Socket.Receive.RECEIVE_TYPE_ROOM = 0x1; GameLib.API.Socket.Receive.RECEIVE_TYPE_ROOM = 0x1;
GameLib.API.Socket.Receive.RECEIVE_TYPE_PEER = 0x2; GameLib.API.Socket.Receive.RECEIVE_TYPE_PEER = 0x2;
/** /**
* Creates an API Socket.Receive from an Object Socket.Receive * Creates an API Socket.Receive from an Object Socket.Receive
* @param socket GameLib.SocketsRuntime * @param socket GameLib.SocketsRuntime

View File

@ -37,11 +37,21 @@ GameLib.Socket = function(
this.connected = false; this.connected = false;
var linkedObjects = {
server : GameLib.Server
};
if (this.socketType === GameLib.API.Socket.TYPE_CAST) {
linkedObjects.source = GameLib.Component;
}
if (this.socketType === GameLib.API.Socket.TYPE_RECEIVE) {
linkedObjects.destination = GameLib.Component;
}
GameLib.Component.call( GameLib.Component.call(
this, this,
{ linkedObjects
server : GameLib.Server
}
); );
}; };

View File

@ -18,10 +18,6 @@ GameLib.Socket.Cast = function(
}; };
} }
if (apiSocketCast instanceof GameLib.Socket.Cast) {
return apiSocketCast;
}
GameLib.API.Socket.Cast.call( GameLib.API.Socket.Cast.call(
this, this,
apiSocketCast, apiSocketCast,
@ -35,16 +31,9 @@ GameLib.Socket.Cast = function(
socket, socket,
apiSocketCast apiSocketCast
); );
GameLib.Component.call(
this,
{
source : GameLib.Component
}
);
}; };
GameLib.Socket.Cast.prototype = Object.create(GameLib.API.Socket.Cast.prototype); GameLib.Socket.Cast.prototype = Object.create(GameLib.Socket.prototype);
GameLib.Socket.Cast.prototype.constructor = GameLib.Socket.Cast; GameLib.Socket.Cast.prototype.constructor = GameLib.Socket.Cast;
GameLib.Socket.Cast.prototype.createInstance = function() { GameLib.Socket.Cast.prototype.createInstance = function() {

View File

@ -18,10 +18,6 @@ GameLib.Socket.Receive = function(
}; };
} }
if (apiSocketReceive instanceof GameLib.Socket.Receive) {
return apiSocketReceive;
}
GameLib.API.Socket.Receive.call( GameLib.API.Socket.Receive.call(
this, this,
apiSocketReceive, apiSocketReceive,
@ -36,16 +32,9 @@ GameLib.Socket.Receive = function(
apiSocketReceive apiSocketReceive
); );
GameLib.Component.call(
this,
{
destination : GameLib.Component
}
);
}; };
GameLib.Socket.Receive.prototype = Object.create(GameLib.API.Socket.Receive.prototype); GameLib.Socket.Receive.prototype = Object.create(GameLib.Socket.prototype);
GameLib.Socket.Receive.prototype.constructor = GameLib.Socket.Receive; GameLib.Socket.Receive.prototype.constructor = GameLib.Socket.Receive;
GameLib.Socket.Receive.prototype.createInstance = function() { GameLib.Socket.Receive.prototype.createInstance = function() {