Rename WorkerRemote to RenderWebGLWorker

This commit is contained in:
Christopher Willis-Ford
2016-06-15 15:36:46 -07:00
parent ad94df4afe
commit b00ec4c501
3 changed files with 23 additions and 21 deletions

View File

@@ -1,31 +1,33 @@
importScripts('./render-webgl-worker.js'); importScripts('./render-webgl-worker.js');
var remote; var renderer;
var drawableID; var drawableID;
var drawableID2; var drawableID2;
var fudge = 90; var fudge = 90;
onmessage = function(message) { onmessage = function(message) {
if (message.data.id == 'RendererConnected') { if (message.data.fudge != undefined) {
initWorker();
}
else if (message.data.fudge != undefined) {
fudge = message.data.fudge; fudge = message.data.fudge;
} }
else {
if (message.data.id == 'RendererConnected') {
initWorker();
}
remote.onmessage(message); renderer.onmessage(message);
}
}; };
function initWorker() { function initWorker() {
remote = new RenderWebGLRemote(); renderer = new RenderWebGLWorker();
var create1 = remote.createDrawable(); var create1 = renderer.createDrawable();
var create2 = remote.createDrawable(); var create2 = renderer.createDrawable();
create1.then(function (id) { create1.then(function (id) {
drawableID = id; drawableID = id;
remote.updateDrawableProperties(drawableID, { renderer.updateDrawableProperties(drawableID, {
position: [0, 0], position: [0, 0],
scale: 100, scale: 100,
direction: 90 direction: 90
@@ -33,7 +35,7 @@ function initWorker() {
}); });
create2.then(function (id) { create2.then(function (id) {
drawableID2 = id; drawableID2 = id;
remote.updateDrawableProperties(drawableID2, { renderer.updateDrawableProperties(drawableID2, {
skin: '09dc888b0b7df19f70d81588ae73420e.svg' skin: '09dc888b0b7df19f70d81588ae73420e.svg'
}); });
}); });
@@ -52,5 +54,5 @@ function thinkStep() {
//props.pixelate = fudge; //props.pixelate = fudge;
//props.scale = 100; //props.scale = 100;
remote.updateDrawableProperties(drawableID, props); renderer.updateDrawableProperties(drawableID, props);
} }

View File

@@ -1,7 +1,7 @@
var WorkerMessages = require('./WorkerMessages'); var WorkerMessages = require('./WorkerMessages');
class WorkerRemote{ class RenderWebGLWorker {
constructor() { constructor() {
var instance = this; var instance = this;
@@ -10,7 +10,7 @@ class WorkerRemote{
* worker's onmessage function or install it directly. * worker's onmessage function or install it directly.
* @param {MessageEvent} message The message to be handled. * @param {MessageEvent} message The message to be handled.
*/ */
this.onmessage = function(message) { this.onmessage = function (message) {
instance._onmessage(message); instance._onmessage(message);
}; };
@@ -25,9 +25,9 @@ class WorkerRemote{
} }
} }
module.exports = WorkerRemote; module.exports = RenderWebGLWorker;
WorkerRemote.prototype._getToken = function() { RenderWebGLWorker.prototype._getToken = function() {
return (this._nextToken++) + ''; return (this._nextToken++) + '';
}; };
@@ -36,7 +36,7 @@ WorkerRemote.prototype._getToken = function() {
* @param {MessageEvent} message The message to be handled. * @param {MessageEvent} message The message to be handled.
* @private * @private
*/ */
WorkerRemote.prototype._onmessage = function(message) { RenderWebGLWorker.prototype._onmessage = function(message) {
// It's sometimes valid for a message to have no token // It's sometimes valid for a message to have no token
var token = message.data.token; var token = message.data.token;
@@ -56,7 +56,7 @@ WorkerRemote.prototype._onmessage = function(message) {
* Create a new Drawable and add it to the scene. * Create a new Drawable and add it to the scene.
* @returns {Promise.<int>} The ID of the new Drawable. * @returns {Promise.<int>} The ID of the new Drawable.
*/ */
WorkerRemote.prototype.createDrawable = function() { RenderWebGLWorker.prototype.createDrawable = function() {
var instance = this; var instance = this;
return new Promise(function (resolve) { return new Promise(function (resolve) {
var token = instance._getToken(); var token = instance._getToken();
@@ -73,7 +73,7 @@ WorkerRemote.prototype.createDrawable = function() {
* @param {int} drawableID The ID of the Drawable to update. * @param {int} drawableID The ID of the Drawable to update.
* @param {Object.<string,*>} properties The new property values to set. * @param {Object.<string,*>} properties The new property values to set.
*/ */
WorkerRemote.prototype.updateDrawableProperties = function ( RenderWebGLWorker.prototype.updateDrawableProperties = function (
drawableID, properties) { drawableID, properties) {
self.postMessage({ self.postMessage({

View File

@@ -1,6 +1,6 @@
var WorkerRemote = require('./WorkerRemote'); var RenderWebGLWorker = require('./RenderWebGLWorker');
/** /**
* Export for use in a Web Worker * Export for use in a Web Worker
*/ */
self.RenderWebGLRemote = WorkerRemote; self.RenderWebGLWorker = RenderWebGLWorker;