forked from ilikecats/papercats
Check if we can connect with WS
This commit is contained in:
parent
fab29a8f75
commit
6949374b8e
103
game-client.js
103
game-client.js
@ -29,6 +29,74 @@ if ( !window.requestAnimationFrame ) {
|
||||
})();
|
||||
}
|
||||
|
||||
var norun = false;
|
||||
function run() {
|
||||
if (norun)
|
||||
return; //Prevent multiple clicks.
|
||||
norun = true;
|
||||
$("#begin").css("display: none");
|
||||
$("#begin").animate({
|
||||
opacity: 0
|
||||
}, 1000);
|
||||
|
||||
user = null;
|
||||
deadFrames = 0;
|
||||
|
||||
//Socket connection.
|
||||
//, {transports: ['websocket'], upgrade: false}
|
||||
connectServer();
|
||||
socket.emit('hello', {
|
||||
name: $("#name").val(),
|
||||
type: 0, //Free-for-all
|
||||
gameid: -1 //Requested game-id, or -1 for anyone.
|
||||
}, function(success) {
|
||||
if (success) console.info("Connected to game!");
|
||||
else console.error("Unable to connect to game.");
|
||||
});
|
||||
}
|
||||
|
||||
$(function() {
|
||||
var error = $("#error");
|
||||
|
||||
if (!window.WebSocket)
|
||||
{
|
||||
error.text("Your browser does not support WebSockets!");
|
||||
return;
|
||||
}
|
||||
|
||||
error.text("Loading..."); //TODO: show loading screen.
|
||||
var success = false;
|
||||
var socket = io('http://paper-io-thekidofarcrania.c9users.io:8081', {
|
||||
'forceNew': true,
|
||||
upgrade: false,
|
||||
transports: ['websocket']
|
||||
});
|
||||
|
||||
socket.on('connect_error', function() {
|
||||
if (!success)
|
||||
error.text("Cannot connect with server. This probably is due to misconfigured proxy server. (Try using a different browser)");
|
||||
})
|
||||
socket.emit("checkConn", function() {
|
||||
success = true;
|
||||
socket.disconnect();
|
||||
});
|
||||
setTimeout(function() {
|
||||
if (!success)
|
||||
error.text("Cannot connect with server. This probably is due to misconfigured proxy server. (Try using a different browser)");
|
||||
else
|
||||
{
|
||||
error.text("");
|
||||
$("input").keypress(function(evt) {
|
||||
if (evt.which === 13)
|
||||
requestAnimationFrame(run);
|
||||
});
|
||||
$("button").click(function(evt) {
|
||||
requestAnimationFrame(run);
|
||||
});
|
||||
}
|
||||
}, 2000);
|
||||
});
|
||||
|
||||
var user, socket, frame;
|
||||
|
||||
//Event listeners
|
||||
@ -61,32 +129,7 @@ $(document).keydown(function(e) {
|
||||
e.preventDefault();
|
||||
});
|
||||
|
||||
var norun = false;
|
||||
window.run = run;
|
||||
function run() {
|
||||
if (norun)
|
||||
return; //Prevent multiple clicks.
|
||||
norun = true;
|
||||
$("#begin").css("display: none");
|
||||
$("#begin").animate({
|
||||
opacity: 0
|
||||
}, 1000);
|
||||
|
||||
user = null;
|
||||
deadFrames = 0;
|
||||
|
||||
//Socket connection.
|
||||
//, {transports: ['websocket'], upgrade: false}
|
||||
connectServer();
|
||||
socket.emit('hello', {
|
||||
name: $("#name").val(),
|
||||
type: 0, //Free-for-all
|
||||
gameid: -1 //Requested game-id, or -1 for anyone.
|
||||
}, function(success) {
|
||||
if (success) console.info("Connected to game!");
|
||||
else console.error("Unable to connect to game.");
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
var grid = renderer.grid;
|
||||
var timeout = undefined;
|
||||
@ -99,7 +142,11 @@ var frameCache = []; //Frames after our request.
|
||||
function connectServer() {
|
||||
io.j = [];
|
||||
io.sockets = [];
|
||||
socket = io('http://paper-io-thekidofarcrania.c9users.io:8081', {'forceNew': true});
|
||||
socket = io('http://paper-io-thekidofarcrania.c9users.io:8081', {
|
||||
'forceNew': true,
|
||||
upgrade: false,
|
||||
transports: ['websocket']
|
||||
});
|
||||
socket.on('connect', function(){
|
||||
console.info("Connected to server.");
|
||||
});
|
||||
@ -278,4 +325,4 @@ function paintLoop()
|
||||
renderer.update();
|
||||
requestAnimationFrame(paintLoop);
|
||||
}
|
||||
}
|
||||
}
|
104
public/bundle.js
104
public/bundle.js
@ -315,6 +315,74 @@ if ( !window.requestAnimationFrame ) {
|
||||
})();
|
||||
}
|
||||
|
||||
var norun = false;
|
||||
function run() {
|
||||
if (norun)
|
||||
return; //Prevent multiple clicks.
|
||||
norun = true;
|
||||
$("#begin").css("display: none");
|
||||
$("#begin").animate({
|
||||
opacity: 0
|
||||
}, 1000);
|
||||
|
||||
user = null;
|
||||
deadFrames = 0;
|
||||
|
||||
//Socket connection.
|
||||
//, {transports: ['websocket'], upgrade: false}
|
||||
connectServer();
|
||||
socket.emit('hello', {
|
||||
name: $("#name").val(),
|
||||
type: 0, //Free-for-all
|
||||
gameid: -1 //Requested game-id, or -1 for anyone.
|
||||
}, function(success) {
|
||||
if (success) console.info("Connected to game!");
|
||||
else console.error("Unable to connect to game.");
|
||||
});
|
||||
}
|
||||
|
||||
$(function() {
|
||||
var error = $("#error");
|
||||
|
||||
if (!window.WebSocket)
|
||||
{
|
||||
error.text("Your browser does not support WebSockets!");
|
||||
return;
|
||||
}
|
||||
|
||||
error.text("Loading..."); //TODO: show loading screen.
|
||||
var success = false;
|
||||
var socket = io('http://paper-io-thekidofarcrania.c9users.io:8081', {
|
||||
'forceNew': true,
|
||||
upgrade: false,
|
||||
transports: ['websocket']
|
||||
});
|
||||
|
||||
socket.on('connect_error', function() {
|
||||
if (!success)
|
||||
error.text("Cannot connect with server. This probably is due to misconfigured proxy server. (Try using a different browser)");
|
||||
})
|
||||
socket.emit("checkConn", function() {
|
||||
success = true;
|
||||
socket.disconnect();
|
||||
});
|
||||
setTimeout(function() {
|
||||
if (!success)
|
||||
error.text("Cannot connect with server. This probably is due to misconfigured proxy server. (Try using a different browser)");
|
||||
else
|
||||
{
|
||||
error.text("");
|
||||
$("input").keypress(function(evt) {
|
||||
if (evt.which === 13)
|
||||
requestAnimationFrame(run);
|
||||
});
|
||||
$("button").click(function(evt) {
|
||||
requestAnimationFrame(run);
|
||||
});
|
||||
}
|
||||
}, 2000);
|
||||
});
|
||||
|
||||
var user, socket, frame;
|
||||
|
||||
//Event listeners
|
||||
@ -347,32 +415,7 @@ $(document).keydown(function(e) {
|
||||
e.preventDefault();
|
||||
});
|
||||
|
||||
var norun = false;
|
||||
window.run = run;
|
||||
function run() {
|
||||
if (norun)
|
||||
return; //Prevent multiple clicks.
|
||||
norun = true;
|
||||
$("#begin").css("display: none");
|
||||
$("#begin").animate({
|
||||
opacity: 0
|
||||
}, 1000);
|
||||
|
||||
user = null;
|
||||
deadFrames = 0;
|
||||
|
||||
//Socket connection.
|
||||
//, {transports: ['websocket'], upgrade: false}
|
||||
connectServer();
|
||||
socket.emit('hello', {
|
||||
name: $("#name").val(),
|
||||
type: 0, //Free-for-all
|
||||
gameid: -1 //Requested game-id, or -1 for anyone.
|
||||
}, function(success) {
|
||||
if (success) console.info("Connected to game!");
|
||||
else console.error("Unable to connect to game.");
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
var grid = renderer.grid;
|
||||
var timeout = undefined;
|
||||
@ -385,7 +428,11 @@ var frameCache = []; //Frames after our request.
|
||||
function connectServer() {
|
||||
io.j = [];
|
||||
io.sockets = [];
|
||||
socket = io('http://paper-io-thekidofarcrania.c9users.io:8081', {'forceNew': true});
|
||||
socket = io('http://paper-io-thekidofarcrania.c9users.io:8081', {
|
||||
'forceNew': true,
|
||||
upgrade: false,
|
||||
transports: ['websocket']
|
||||
});
|
||||
socket.on('connect', function(){
|
||||
console.info("Connected to server.");
|
||||
});
|
||||
@ -564,8 +611,7 @@ function paintLoop()
|
||||
renderer.update();
|
||||
requestAnimationFrame(paintLoop);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
},{"./game-consts.js":5,"./game-core.js":6,"./game-renderer.js":7,"./player.js":56,"socket.io-client":9}],5:[function(require,module,exports){
|
||||
function constant(val)
|
||||
{
|
||||
|
@ -7,15 +7,17 @@
|
||||
</head>
|
||||
<body>
|
||||
<canvas id="main-ui"></canvas>
|
||||
<form autocomplete="off" onsubmit="requestAnimationFrame(run); return false;">
|
||||
<div id="begin" style="opacity: .99999" class="fullscreen">
|
||||
<div class="center">
|
||||
<h1>Paper.IO!</h1>
|
||||
<small>Todo: replace ^^^ with a picture. Work in progress.</small>
|
||||
<h1>Enter your name</h1>
|
||||
<input autocomplete="off" id="name" placeholder="An awesome name!">
|
||||
<button type="submit">Play!</button>
|
||||
<div id="begin" style="opacity: .99999" class="fullscreen">
|
||||
<div class="center">
|
||||
<h1>Paper.IO!</h1>
|
||||
<small>Todo: replace ^^^ with a picture. Work in progress.</small>
|
||||
<h1>Enter your name</h1>
|
||||
<input autocomplete="off" id="name" placeholder="An awesome name!">
|
||||
<button type="submit">Play!</button>
|
||||
<div>
|
||||
<small id="error">Your browser does not support JavaScript!</small>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
||||
</body>
|
@ -9,7 +9,9 @@ body, html {
|
||||
color: white;
|
||||
font-family: "Changa", "Sans Serif";
|
||||
}
|
||||
|
||||
#error {
|
||||
color: red;
|
||||
}
|
||||
canvas {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
|
@ -20,7 +20,7 @@ server.listen(8080);
|
||||
|
||||
server = http.createServer();
|
||||
var io = require('socket.io')(server);
|
||||
//io.set('transports', ['websocket']);
|
||||
io.set('transports', ['websocket']);
|
||||
|
||||
var Game = require('./game-server.js');
|
||||
var games = [new Game()];
|
||||
@ -30,6 +30,7 @@ io.on('connection', function(socket){
|
||||
fn(true);
|
||||
games[0].addPlayer(socket, data.name);
|
||||
});
|
||||
socket.on("checkConn", function(fn) { fn(); });
|
||||
});
|
||||
server.listen(8081);
|
||||
|
||||
@ -38,4 +39,4 @@ function tick() {
|
||||
setTimeout(tick, 1000 / 60);
|
||||
}
|
||||
tick();
|
||||
//setTimeout(tick, 1000 / 60);
|
||||
//setTimeout(tick, 1000 / 60);
|
Loading…
Reference in New Issue
Block a user