Basic backend functionality is there

This commit is contained in:
Michael Schmatz 2014-05-05 13:26:37 -07:00
parent 717651d6ff
commit 97f3694dbf
3 changed files with 184 additions and 38 deletions

View file

@ -60,14 +60,18 @@ var console = {
console.error = console.info = console.log; console.error = console.info = console.log;
self.console = console; self.console = console;
importScripts('/javascripts/world.js');
// We could do way more from this: http://stackoverflow.com/questions/10653809/making-webworkers-a-safe-environment // We could do way more from this: http://stackoverflow.com/questions/10653809/making-webworkers-a-safe-environment
Object.defineProperty(self, "XMLHttpRequest", { Object.defineProperty(self, "XMLHttpRequest", {
get: function() { throw new Error("Access to XMLHttpRequest is forbidden."); }, get: function() { throw new Error("Access to XMLHttpRequest is forbidden."); },
configurable: false configurable: false
}); });
if (!Array.prototype.last){
Array.prototype.last = function(){
return this[this.length - 1];
};
}
self.transferableSupported = function transferableSupported() { self.transferableSupported = function transferableSupported() {
// Not in IE, even in IE 11 // Not in IE, even in IE 11
try { try {
@ -79,9 +83,15 @@ self.transferableSupported = function transferableSupported() {
} }
return false; return false;
} }
importScripts('/javascripts/world.js');
var World = self.require('lib/world/world'); var World = self.require('lib/world/world');
var GoalManager = self.require('lib/world/GoalManager'); var GoalManager = self.require('lib/world/GoalManager');
serializedClasses = {
"Thang": self.require('lib/world/thang'),
"Vector": self.require('lib/world/vector'),
"Rectangle": self.require('lib/world/rectangle')
}
self.getCurrentFrame = function getCurrentFrame(args) { return self.world.frames.length; }; self.getCurrentFrame = function getCurrentFrame(args) { return self.world.frames.length; };
@ -134,17 +144,161 @@ self.serializeProperty = function serializeProperty(prop, depth) {
return newObject; return newObject;
} }
}; };
self.stringifyValue = function(value, depth) {
self.retrieveThangPropertyFromFrame = function retrieveThangPropertyFromFrame(args) { var brackets, i, isArray, isObject, key, prefix, s, sep, size, v, values, _i, _j, _len, _len1, _ref, _ref1, _ref2, _ref3;
var thangID = args.thangID; if (!value || _.isString(value)) {
var prop = args.prop; return value;
var retrieveProperty = function retrieveProperty() }
{ if (_.isFunction(value)) {
var unserializedProperty = self.world.thangMap[thangID][prop]; if (depth === 2) {
self.postMessage({type: 'debug-value-return', serialized: self.serializeProperty(unserializedProperty,0)}); return void 0;
} else {
return "<Function>";
}
}
if (value === this.thang && depth) {
return "<this " + value.id + ">";
}
if (depth === 2) {
if (((_ref = value.constructor) != null ? _ref.className : void 0) === "Thang") {
value = "<" + (value.type || value.spriteName) + " - " + value.id + ", " + (value.pos ? value.pos.toString() : 'non-physical') + ">";
} else {
value = value.toString();
}
return value;
}
isArray = _.isArray(value);
isObject = _.isObject(value);
if (!(isArray || isObject)) {
return value.toString();
}
brackets = isArray ? ["[", "]"] : ["{", "}"];
size = _.size(value);
if (!size) {
return brackets.join("");
}
values = [];
if (isArray) {
for (_i = 0, _len = value.length; _i < _len; _i++) {
v = value[_i];
s = this.stringifyValue(v, depth + 1);
if (s !== void 0) {
values.push("" + s);
}
}
} else {
_ref2 = (_ref1 = value.apiProperties) != null ? _ref1 : _.keys(value);
for (_j = 0, _len1 = _ref2.length; _j < _len1; _j++) {
key = _ref2[_j];
s = this.stringifyValue(value[key], depth + 1);
if (s !== void 0) {
values.push(key + ": " + s);
}
}
}
sep = '\n' + ((function() {
var _k, _results;
_results = [];
for (i = _k = 0; 0 <= depth ? _k < depth : _k > depth; i = 0 <= depth ? ++_k : --_k) {
_results.push(" ");
}
return _results;
})()).join('');
prefix = (_ref3 = value.constructor) != null ? _ref3.className : void 0;
if (isArray) {
if (prefix == null) {
prefix = "Array";
}
}
if (isObject) {
if (prefix == null) {
prefix = "Object";
}
}
prefix = prefix ? prefix + " " : "";
return "" + prefix + brackets[0] + sep + " " + (values.join(sep + ' ')) + sep + brackets[1];
}; };
self.retrieveValueFromFrame = function retrieveValueFromFrame(args) {
var retrieveProperty = function retrieveProperty(currentThangID, currentSpellID, variableChain)
{
var prop;
var value;
var keys = [];
for (var i = 0, len = variableChain.length; i < len; i++)
{
prop = variableChain[i];
if (prop === "this")
{
value = self.world.thangMap[currentThangID];
}
else if (i === 0)
{
try
{
value = self.world.userCodeMap[currentThangID][currentSpellID].flow.states.last().statements.last().variables[prop];
}
catch (e)
{
value = undefined;
}
}
else
{
value = value[prop];
}
keys.push(prop);
if (!value) break;
var classOfValue;
if (classOfValue = serializedClasses[value.CN])
{
if (value.CN === "Thang")
{
var thang = self.world.thangMap[value.id];
value = thang || "<Thang " + value.id + " (non-existent)>"
}
else
{
value = classOfValue.deserializeFromAether(value);
}
}
}
var serializedProperty = {
"key": keys.join("."),
"value": self.stringifyValue(value,0)
};
self.postMessage({type: 'debug-value-return', serialized: serializedProperty});
};
self.enableFlowOnThangSpell(args.currentThangID, args.currentSpellID, args.userCodeMap);
self.setupWorldToRunUntilFrame(args); self.setupWorldToRunUntilFrame(args);
self.world.loadFramesUntilFrame(args.frame, retrieveProperty, self.onWorldError, self.onWorldLoadProgress); self.world.loadFramesUntilFrame(
args.frame,
retrieveProperty.bind({},args.currentThangID, args.currentSpellID, args.variableChain),
self.onWorldError,
self.onWorldLoadProgress
);
};
self.enableFlowOnThangSpell = function enableFlowOnThang(thangID, spellID, userCodeMap) {
try {
if (userCodeMap[thangID][spellID].originalOptions.includeFlow === true &&
userCodeMap[thangID][spellID].originalOptions.noSerializationInFlow)
return;
else
{
userCodeMap[thangID][spellID].originalOptions.includeFlow = true;
userCodeMap[thangID][spellID].originalOptions.noSerializationInFlow = true;
var temporaryAether = Aether.deserialize(userCodeMap[thangID][spellID]);
temporaryAether.transpile(temporaryAether.raw);
userCodeMap[thangID][spellID] = temporaryAether.serialize();
}
}
catch (e) {
console.log("there was an error enabling flow on thang spell:" + e)
}
}; };
self.setupWorldToRunUntilFrame = function setupWorldToRunUntilFrame(args) { self.setupWorldToRunUntilFrame = function setupWorldToRunUntilFrame(args) {
@ -156,11 +310,8 @@ self.setupWorldToRunUntilFrame = function setupWorldToRunUntilFrame(args) {
var stringifiedUserCodeMap = JSON.stringify(args.userCodeMap); var stringifiedUserCodeMap = JSON.stringify(args.userCodeMap);
var userCodeMapHasChanged = ! _.isEqual(self.currentUserCodeMapCopy, stringifiedUserCodeMap); var userCodeMapHasChanged = ! _.isEqual(self.currentUserCodeMapCopy, stringifiedUserCodeMap);
self.currentUserCodeMapCopy = stringifiedUserCodeMap; self.currentUserCodeMapCopy = stringifiedUserCodeMap;
if (!self.world || userCodeMapHasChanged || args.frame < self.currentWorldFrame)
{
try { try {
self.world = new World(args.worldName, args.userCodeMap); self.world = new World(args.worldName, args.userCodeMap);
if(args.level) if(args.level)
@ -176,7 +327,6 @@ self.setupWorldToRunUntilFrame = function setupWorldToRunUntilFrame(args) {
return; return;
} }
Math.random = self.world.rand.randf; // so user code is predictable Math.random = self.world.rand.randf; // so user code is predictable
}
self.world.totalFrames = args.frame; //hack to work around error checking self.world.totalFrames = args.frame; //hack to work around error checking
self.currentWorldFrame = args.frame; self.currentWorldFrame = args.frame;

View file

@ -140,9 +140,10 @@ module.exports = class God
goals: @goalManager?.getGoals() goals: @goalManager?.getGoals()
frame: frame frame: frame
retrieveThangPropertyFromFrame: (thang, prop, frame) -> retrieveValueFromFrame: (thangID, spellID, variableChain, frame) ->
@debugWorker.postMessage @debugWorker.postMessage
func: 'retrieveThangPropertyFromFrame' func: 'retrieveValueFromFrame'
args: args:
worldName: @level.name worldName: @level.name
userCodeMap: @currentUserCodeMap userCodeMap: @currentUserCodeMap
@ -150,8 +151,9 @@ module.exports = class God
firstWorld: @firstWorld firstWorld: @firstWorld
goals: @goalManager?.getGoals() goals: @goalManager?.getGoals()
frame: frame frame: frame
thangID: thang currentThangID: thangID
prop: prop currentSpellID: spellID
variableChain: variableChain
getDebugWorldCurrentFrame: -> getDebugWorldCurrentFrame: ->

View file

@ -8,12 +8,6 @@ WorldScriptNote = require './world_script_note'
{now, consolidateThangs, typedArraySupport} = require './world_utils' {now, consolidateThangs, typedArraySupport} = require './world_utils'
Component = require 'lib/world/component' Component = require 'lib/world/component'
System = require 'lib/world/system' System = require 'lib/world/system'
#adding this for the debug worker
serializedClasses =
Thang: require "lib/world/thang"
Vector: require "lib/world/vector"
Rectangle: require "lib/world/rectangle"
PROGRESS_UPDATE_INTERVAL = 200 PROGRESS_UPDATE_INTERVAL = 200
DESERIALIZATION_INTERVAL = 20 DESERIALIZATION_INTERVAL = 20