mirror of
https://github.com/wassname/GarageServer.IO.git
synced 2026-06-27 16:10:34 +08:00
Cleanup and minor namespace change
This commit is contained in:
@@ -13,15 +13,16 @@ options = {
|
||||
logging: true
|
||||
}
|
||||
*/
|
||||
var GarageServerIO = (function (socketio) {
|
||||
|
||||
window.GarageServerIO = (function (window, socketio) {
|
||||
"use strict";
|
||||
|
||||
function StateController() {
|
||||
this.state = {};
|
||||
this.clientTime;
|
||||
this.renderTime;
|
||||
this.physicsDelta;
|
||||
this.Id;
|
||||
this.clientTime = 0;
|
||||
this.renderTime = 0;
|
||||
this.physicsDelta = 0.0;
|
||||
this.Id = '';
|
||||
this.pingDelay = 100;
|
||||
this.interpolationDelay = 100;
|
||||
this.interpolation = false;
|
||||
@@ -352,4 +353,4 @@ window.GarageServerIO = (function (window, socketio) {
|
||||
setState: setState
|
||||
};
|
||||
|
||||
}) (window, io);
|
||||
}) (io);
|
||||
@@ -1,7 +1,10 @@
|
||||
$(function () {
|
||||
|
||||
"use strict";
|
||||
|
||||
var canvas = document.getElementById('gameCanvas'), ctxCanvas = canvas.getContext('2d'), keyboard = new THREEx.KeyboardState();
|
||||
|
||||
GarageServerIO.initializeGarageServer('http://garageserver_io.jbillmann.c9.io', {
|
||||
GarageServerIO.initializeGarageServer('http://garageserver_io.jbillmann.c9.io', {
|
||||
logging: true,
|
||||
onUpdatePlayerPhysics: GamePhysics.getNewState,
|
||||
onInterpolation: GamePhysics.getInterpolatedState
|
||||
|
||||
@@ -1,14 +1,14 @@
|
||||
window.GameLoop = (function (window) {
|
||||
var GameLoop = (function (window) {
|
||||
"use strict";
|
||||
|
||||
var requestAnimFrame = (function () {
|
||||
return window.requestAnimationFrame || window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame || window.oRequestAnimationFrame || window.msRequestAnimationFrame || function (callback) { window.setTimeout(callback, 1000/60); };
|
||||
})(),
|
||||
}()),
|
||||
_currentTime = new Date().getTime(),
|
||||
_accumulator = 0.0,
|
||||
|
||||
start = function (renderCallback, updateCallback) {
|
||||
loop();
|
||||
|
||||
function loop () {
|
||||
function loop() {
|
||||
requestAnimFrame(loop);
|
||||
|
||||
var newTime = new Date().getTime(), frameTime = newTime - _currentTime;
|
||||
@@ -25,9 +25,10 @@ window.GameLoop = (function (window) {
|
||||
|
||||
renderCallback();
|
||||
}
|
||||
loop();
|
||||
};
|
||||
|
||||
return {
|
||||
start: start
|
||||
};
|
||||
}) (window);
|
||||
}(window));
|
||||
@@ -17,7 +17,7 @@ options = {
|
||||
}
|
||||
*/
|
||||
|
||||
function GarageServer (socketio, options) {
|
||||
function GarageServer(socketio, options) {
|
||||
this.io = socketio;
|
||||
this.game = new garageServerGame(options);
|
||||
this.registerSocketEvents(options);
|
||||
@@ -30,7 +30,7 @@ GarageServer.prototype.registerSocketEvents = function (options) {
|
||||
if (options.logging) {
|
||||
console.log('garageserver.io:: socket ' + socket.id + ' connection');
|
||||
}
|
||||
socket.emit('state', {
|
||||
socket.emit('state', {
|
||||
physicsDelta: (options.physicsInterval ? options.physicsInterval : 15) / 1000,
|
||||
smoothingFactor: options.smoothingFactor ? options.smoothingFactor : 1,
|
||||
interpolation: options.interpolation ? options.interpolation : false,
|
||||
|
||||
@@ -7,7 +7,7 @@ function GarageServerGame(options) {
|
||||
this.playerController = new playerController();
|
||||
this.entityController = new entityController();
|
||||
this.options = options;
|
||||
this.startTime;
|
||||
this.startTime = 0;
|
||||
this.stateInterval = options.stateInterval ? options.stateInterval : 45;
|
||||
this.stateIntervalId = 0;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user