jeena/chuck.js
1
0
Fork 0
mirror of https://github.com/logsol/chuck.js.git synced 2026-05-11 10:37:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactoring of Options. Renamed to OptionsHelper

Browse source 
Because that is what it is.
This commit is contained in:
logsol 2016-10-10 23:10:43 +02:00
parent ce01c8888e
commit 05c4e4de81
6 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/Game/Channel/Channel.js
View file

@ -3,11 +3,11 @@
"Lib/Utilities/NotificationCenter",
"Game/Channel/User",
"Lib/Utilities/Protocol/Helper",
"Lib/Utilities/Options",
"Lib/Utilities/OptionsHelper",
"Game/Config/Settings"
],
function (GameController, nc, User, ProtocolHelper, Options, Settings) {
function (GameController, nc, User, ProtocolHelper, OptionsHelper, Settings) {
"use strict";
@ -21,7 +21,7 @@
this.levelListIndex = -1;
this.gameController = null;
this.options = options = Options.merge(options, {
this.options = options = OptionsHelper.merge(options, {
levelUids: Settings.CHANNEL_DEFAULT_LEVELS
});

6
app/Game/Core/GameObjects/Item.js
View file

@ -1,14 +1,14 @@
define([
"Game/" + GLOBALS.context + "/GameObjects/GameObject",
"Lib/Vendor/Box2D",
"Lib/Utilities/Options",
"Lib/Utilities/OptionsHelper",
"Game/Config/Settings",
"Lib/Utilities/Exception",
"Lib/Utilities/NotificationCenter",
"Lib/Utilities/Assert"
],
function (Parent, Box2D, Options, Settings, Exception, nc, Assert) {
function (Parent, Box2D, OptionsHelper, Settings, Exception, nc, Assert) {
"use strict";
@ -26,7 +26,7 @@ function (Parent, Box2D, Options, Settings, Exception, nc, Assert) {
y: parseFloat(options.y)
};
this.options = Options.merge(floatOptions, options);
this.options = OptionsHelper.merge(floatOptions, options);
if(!this.options.category) {
// FIXME add more validation

8
app/Game/Core/GameObjects/Items/RagDoll.js
View file

@ -4,11 +4,11 @@ define([
"Game/Config/Settings",
"Lib/Utilities/NotificationCenter",
"Lib/Utilities/Assert",
"Lib/Utilities/Options",
"Lib/Utilities/OptionsHelper",
"Game/Config/ItemSettings",
],
function (Parent, Box2D, Settings, nc, Assert, Options, ItemSettings) {
function (Parent, Box2D, Settings, nc, Assert, OptionsHelper, ItemSettings) {
"use strict";
@ -96,8 +96,8 @@ function (Parent, Box2D, Settings, nc, Assert, Options, ItemSettings) {
// FIXME
var ragdollOptions = Options.merge(ItemSettings.RagDoll, ItemSettings.Default);
options = Options.merge(options, ragdollOptions);
var ragdollOptions = OptionsHelper.merge(ItemSettings.RagDoll, ItemSettings.Default);
options = OptionsHelper.merge(options, ragdollOptions);
Parent.call(this, physicsEngine, uid, options);
//this.createSensor();

6
app/Game/Core/Loader/TiledLevel.js
View file

@ -3,7 +3,7 @@ define([
"Game/Config/Settings",
"Game/Config/ItemSettings",
"Lib/Vendor/Box2D",
"Lib/Utilities/Options",
"Lib/Utilities/OptionsHelper",
"Lib/Utilities/Exception",
"Lib/Utilities/NotificationCenter",
"Lib/Utilities/Assert",
@ -13,7 +13,7 @@ define([
"Game/" + GLOBALS.context + "/GameObjects/Item",
"Game/" + GLOBALS.context + "/GameObjects/Items/Skateboard",
], function (Parent, Settings, ItemSettings, Box2D, Options, Exception, nc, Assert, AbstractLayer, CollisionDetector, Tile, Item, Skateboard) {
], function (Parent, Settings, ItemSettings, Box2D, OptionsHelper, Exception, nc, Assert, AbstractLayer, CollisionDetector, Tile, Item, Skateboard) {
"use strict";
@ -187,7 +187,7 @@ define([
throw new Exception("Item name (" + name + ") cannot be found in item list");
}
return Options.merge(ItemSettings[name], ItemSettings.Default);
return OptionsHelper.merge(ItemSettings[name], ItemSettings.Default);
};
TiledLevel.prototype.getTileImagePath = function(gid) {

14
app/Lib/Utilities/Options.js
View file

@ -6,18 +6,18 @@ function (Exception) {
"use strict";
function Options() {
function OptionsHelper() {
}
Options.prototype.merge = function(options, preset) {
OptionsHelper.prototype.merge = function(options, preset) {
if(!preset && !options) {
throw new Exception("Options requires objects");
throw new Exception("OptionsHelper requires objects");
}
if(preset.constructor !== Object && options.constructor !== Object) {
throw new Exception("Options requires objects");
throw new Exception("OptionsHelper requires objects");
}
if(!preset || preset.constructor !== Object) {
@ -43,7 +43,7 @@ function (Exception) {
if(options[key].constructor !== Object) {
preset[key] = options[key];
} else {
preset[key] = Options.prototype.merge.call(this, options[key], preset[key]);
preset[key] = OptionsHelper.prototype.merge.call(this, options[key], preset[key]);
}
}
}
@ -51,6 +51,6 @@ function (Exception) {
return preset;
}
return new Options();
return new OptionsHelper();
});

6
app/Server/Api.js
View file

@ -2,12 +2,12 @@ define([
"Lib/Utilities/NotificationCenter",
"Lib/Utilities/Protocol/Helper",
"Lib/Utilities/Validate",
"Lib/Utilities/Options",
"Lib/Utilities/OptionsHelper",
"Game/Config/Settings",
"fs"
],
function (nc, ProtocolHelper, validate, Options, Settings, FileSystem) {
function (nc, ProtocolHelper, validate, OptionsHelper, Settings, FileSystem) {
"use strict";
@ -121,7 +121,7 @@ function (nc, ProtocolHelper, validate, Options, Settings, FileSystem) {
scoreLimit: Settings.CHANNEL_DEFAULT_SCORE_LIMIT
};
options = Options.merge(options, defaultOptions);
options = OptionsHelper.merge(options, defaultOptions);
var result = this.coordinator.createChannel(options);
if(result !== false) {