Merge pull request #8 from HeSe/master

Fix for processing example. Fixes #1.

processing/js/Processing-Examples.deploy.js

@@ -4,56 +4,82 @@ smalltalk.addMethod(
 "_draw",
 smalltalk.method({
 selector: "draw",
-fn: function () {
-    var self = this;
-    var drawBlock;
-    drawBlock = function () {var now;var hoursPosition;var minutesPosition;var secondsPosition;smalltalk.send(self['@processing'], "_background_", [224]);now = smalltalk.send(smalltalk.Date || Date, "_new", []);hoursPosition = smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.send(now, "_hours", []), "_\\\\", [12]), "__plus", [smalltalk.send(now, "_minutes", [])]), "__slash", [60]), "__slash", [12]);smalltalk.send(self, "_drawArm_lengthScale_weight_", [hoursPosition, 0.5, 5]);minutesPosition = smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.send(now, "_minutes", []), "__plus", [smalltalk.send(now, "_seconds", [])]), "__slash", [60]), "__slash", [60]);smalltalk.send(self, "_drawArm_lengthScale_weight_", [minutesPosition, 0.8, 3]);secondsPosition = smalltalk.send(smalltalk.send(now, "_seconds", []), "__slash", [60]);return smalltalk.send(self, "_drawArm_lengthScale_weight_", [secondsPosition, 0.9, 1]);};
-    return drawBlock;
-}
-}),
+fn: function (){
+var self=this;
+var drawBlock;
+return smalltalk.withContext(function($ctx1) { 
var $1;
+drawBlock=(function(){
+var now,hoursPosition,minutesPosition,secondsPosition;
+return smalltalk.withContext(function($ctx2) {
_st(self["@processing"])._background_((224));
+now=_st((smalltalk.Date || Date))._new();
+now;
+hoursPosition=_st(_st(_st(_st(_st(now)._hours()).__backslash_backslash((12))).__plus(_st(now)._minutes())).__slash((60))).__slash((12));
+hoursPosition;
+_st(self)._drawArm_lengthScale_weight_(hoursPosition,(0.5),(5));
+minutesPosition=_st(_st(_st(_st(now)._minutes()).__plus(_st(now)._seconds())).__slash((60))).__slash((60));
+minutesPosition;
+_st(self)._drawArm_lengthScale_weight_(minutesPosition,(0.8),(3));
+secondsPosition=_st(_st(now)._seconds()).__slash((60));
+secondsPosition;
+return _st(self)._drawArm_lengthScale_weight_(secondsPosition,(0.9),(1));
+}, function($ctx2) {$ctx2.fillBlock({now:now,hoursPosition:hoursPosition,minutesPosition:minutesPosition,secondsPosition:secondsPosition},$ctx1)})});
+$1=drawBlock;
+return $1;
+}, function($ctx1) {$ctx1.fill(self,"draw",{drawBlock:drawBlock}, smalltalk.ProcessingClock)})},
+messageSends: ["background:", "new", "/", "+", "minutes", "\x5c\x5c", "hours", "drawArm:lengthScale:weight:", "seconds"]}),
 smalltalk.ProcessingClock);
 
 smalltalk.addMethod(
 "_drawArm_lengthScale_weight_",
 smalltalk.method({
 selector: "drawArm:lengthScale:weight:",
-fn: function (aPosition, aLengthScale, aWeight) {
-    var self = this;
-    var myDX;
-    var myDY;
-    smalltalk.send(self['@processing'], "_strokeWeight_", [aWeight]);
-    myDX = smalltalk.send(self['@centerX'], "__plus", [smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.Math || Math, "_sin_", [smalltalk.send(smalltalk.send(aPosition, "__star", [2]), "__star", [smalltalk.send(smalltalk.Math || Math, "_PI", [])])]), "__star", [aLengthScale]), "__star", [self['@maxArmLength']])]);
-    myDY = smalltalk.send(self['@centerY'], "__minus", [smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.Math || Math, "_cos_", [smalltalk.send(smalltalk.send(aPosition, "__star", [2]), "__star", [smalltalk.send(smalltalk.Math || Math, "_PI", [])])]), "__star", [aLengthScale]), "__star", [self['@maxArmLength']])]);
-    smalltalk.send(self['@processing'], "_line_y_dX_dy_", [self['@centerX'], self['@centerY'], myDX, myDY]);
-    return self;
-}
-}),
+fn: function (aPosition,aLengthScale,aWeight){
+var self=this;
+var myDX,myDY;
+return smalltalk.withContext(function($ctx1) { 
_st(self["@processing"])._strokeWeight_(aWeight);
+myDX=_st(self["@centerX"]).__plus(_st(_st(_st((smalltalk.Math || Math))._sin_(_st(_st(aPosition).__star((2))).__star(_st((smalltalk.Math || Math))._PI()))).__star(aLengthScale)).__star(self["@maxArmLength"]));
+myDY=_st(self["@centerY"]).__minus(_st(_st(_st((smalltalk.Math || Math))._cos_(_st(_st(aPosition).__star((2))).__star(_st((smalltalk.Math || Math))._PI()))).__star(aLengthScale)).__star(self["@maxArmLength"]));
+_st(self["@processing"])._line_y_dX_dy_(self["@centerX"],self["@centerY"],myDX,myDY);
+return self}, function($ctx1) {$ctx1.fill(self,"drawArm:lengthScale:weight:",{aPosition:aPosition,aLengthScale:aLengthScale,aWeight:aWeight,myDX:myDX,myDY:myDY}, smalltalk.ProcessingClock)})},
+messageSends: ["strokeWeight:", "+", "*", "sin:", "PI", "-", "cos:", "line:y:dX:dy:"]}),
+smalltalk.ProcessingClock);
+
+smalltalk.addMethod(
+"_firstProcessingInstance",
+smalltalk.method({
+selector: "firstProcessingInstance",
+fn: function (){
+var self=this;
+return smalltalk.withContext(function($ctx1) { 
return Processing.instances[0];
+return self}, function($ctx1) {$ctx1.fill(self,"firstProcessingInstance",{}, smalltalk.ProcessingClock)})},
+messageSends: []}),
 smalltalk.ProcessingClock);
 
 smalltalk.addMethod(
 "_initialize",
 smalltalk.method({
 selector: "initialize",
-fn: function () {
-    var self = this;
-    self['@processing'] = Processing.instances[0];
-    self['@centerX'] = smalltalk.send(smalltalk.send(self['@processing'], "_width", []), "__slash", [2]);
-    self['@centerY'] = smalltalk.send(smalltalk.send(self['@processing'], "_height", []), "__slash", [2]);
-    self['@maxArmLength'] = smalltalk.send(smalltalk.Math || Math, "_min_or_", [self['@centerX'], self['@centerY']]);
-    return self;
-}
-}),
+fn: function (){
+var self=this;
+return smalltalk.withContext(function($ctx1) { 
self["@processing"]=_st(self)._firstProcessingInstance();
+self["@centerX"]=_st(_st(self["@processing"])._width()).__slash((2));
+self["@centerY"]=_st(_st(self["@processing"])._height()).__slash((2));
+self["@maxArmLength"]=_st((smalltalk.Math || Math))._min_or_(self["@centerX"],self["@centerY"]);
+return self}, function($ctx1) {$ctx1.fill(self,"initialize",{}, smalltalk.ProcessingClock)})},
+messageSends: ["firstProcessingInstance", "/", "width", "height", "min:or:"]}),
 smalltalk.ProcessingClock);
 
 smalltalk.addMethod(
 "_processing",
 smalltalk.method({
 selector: "processing",
-fn: function () {
-    var self = this;
-    return self['@processing'];
-}
-}),
+fn: function (){
+var self=this;
+return smalltalk.withContext(function($ctx1) { 
var $1;
+$1=self["@processing"];
+return $1;
+}, function($ctx1) {$ctx1.fill(self,"processing",{}, smalltalk.ProcessingClock)})},
+messageSends: []}),
 smalltalk.ProcessingClock);
 
 
@@ -61,18 +87,15 @@ smalltalk.addMethod(
 "_init",
 smalltalk.method({
 selector: "init",
-fn: function () {
-    var self = this;
-    var clock;
-    var processing;
-    var block;
-    clock = smalltalk.send(smalltalk.ProcessingClock || ProcessingClock, "_new", []);
-    processing = smalltalk.send(clock, "_processing", []);
-    block = smalltalk.send(clock, "_draw", []);
-    processing.draw = block;
-    return self;
-}
-}),
+fn: function (){
+var self=this;
+var clock,processing,block;
+return smalltalk.withContext(function($ctx1) { 
clock=_st((smalltalk.ProcessingClock || ProcessingClock))._new();
+processing=_st(clock)._processing();
+block=_st(clock)._draw();
+_st(processing)._at_put_("draw",block);
+return self}, function($ctx1) {$ctx1.fill(self,"init",{clock:clock,processing:processing,block:block}, smalltalk.ProcessingClock.klass)})},
+messageSends: ["new", "processing", "draw", "at:put:"]}),
 smalltalk.ProcessingClock.klass);
 
 

processing/js/Processing-Examples.js

@@ -5,15 +5,31 @@ smalltalk.addMethod(
 smalltalk.method({
 selector: "draw",
 category: 'not yet classified',
-fn: function () {
-    var self = this;
-    var drawBlock;
-    drawBlock = function () {var now;var hoursPosition;var minutesPosition;var secondsPosition;smalltalk.send(self['@processing'], "_background_", [224]);now = smalltalk.send(smalltalk.Date || Date, "_new", []);hoursPosition = smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.send(now, "_hours", []), "_\\\\", [12]), "__plus", [smalltalk.send(now, "_minutes", [])]), "__slash", [60]), "__slash", [12]);smalltalk.send(self, "_drawArm_lengthScale_weight_", [hoursPosition, 0.5, 5]);minutesPosition = smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.send(now, "_minutes", []), "__plus", [smalltalk.send(now, "_seconds", [])]), "__slash", [60]), "__slash", [60]);smalltalk.send(self, "_drawArm_lengthScale_weight_", [minutesPosition, 0.8, 3]);secondsPosition = smalltalk.send(smalltalk.send(now, "_seconds", []), "__slash", [60]);return smalltalk.send(self, "_drawArm_lengthScale_weight_", [secondsPosition, 0.9, 1]);};
-    return drawBlock;
-},
+fn: function (){
+var self=this;
+var drawBlock;
+return smalltalk.withContext(function($ctx1) { 
var $1;
+drawBlock=(function(){
+var now,hoursPosition,minutesPosition,secondsPosition;
+return smalltalk.withContext(function($ctx2) {
_st(self["@processing"])._background_((224));
+now=_st((smalltalk.Date || Date))._new();
+now;
+hoursPosition=_st(_st(_st(_st(_st(now)._hours()).__backslash_backslash((12))).__plus(_st(now)._minutes())).__slash((60))).__slash((12));
+hoursPosition;
+_st(self)._drawArm_lengthScale_weight_(hoursPosition,(0.5),(5));
+minutesPosition=_st(_st(_st(_st(now)._minutes()).__plus(_st(now)._seconds())).__slash((60))).__slash((60));
+minutesPosition;
+_st(self)._drawArm_lengthScale_weight_(minutesPosition,(0.8),(3));
+secondsPosition=_st(_st(now)._seconds()).__slash((60));
+secondsPosition;
+return _st(self)._drawArm_lengthScale_weight_(secondsPosition,(0.9),(1));
+}, function($ctx2) {$ctx2.fillBlock({now:now,hoursPosition:hoursPosition,minutesPosition:minutesPosition,secondsPosition:secondsPosition},$ctx1)})});
+$1=drawBlock;
+return $1;
+}, function($ctx1) {$ctx1.fill(self,"draw",{drawBlock:drawBlock}, smalltalk.ProcessingClock)})},
 args: [],
 source: "draw\x0a| drawBlock |\x0a\x0adrawBlock := [\x0a  | now hoursPosition minutesPosition secondsPosition |  \x0a  processing background: 224.\x0a  \x0a  now := Date new.\x0a  \x0a  \x22Moving hours arm by small increments\x22\x0a   hoursPosition := now hours \x5c\x5c 12 + now minutes / 60 / 12.\x0a   self drawArm: hoursPosition lengthScale: 0.5 weight: 5.\x0a   \x0a   \x22Moving minutes arm by small increments\x22\x0a    minutesPosition := now minutes + now seconds / 60 / 60.\x0a    self drawArm: minutesPosition lengthScale: 0.80 weight: 3.\x0a\x0a    \x22Moving hour arm by second increments\x22\x0a    secondsPosition := now seconds / 60.\x0a    self drawArm: secondsPosition lengthScale: 0.90 weight: 1.\x0a  ].\x0a\x0a^drawBlock",
-messageSends: ["background:", "new", "/", "+", "minutes", "\x5c\x5c\x5c\x5c", "hours", "drawArm:lengthScale:weight:", "seconds"],
+messageSends: ["background:", "new", "/", "+", "minutes", "\x5c\x5c", "hours", "drawArm:lengthScale:weight:", "seconds"],
 referencedClasses: ["Date"]
 }),
 smalltalk.ProcessingClock);
@@ -23,16 +39,14 @@ smalltalk.addMethod(
 smalltalk.method({
 selector: "drawArm:lengthScale:weight:",
 category: 'not yet classified',
-fn: function (aPosition, aLengthScale, aWeight) {
-    var self = this;
-    var myDX;
-    var myDY;
-    smalltalk.send(self['@processing'], "_strokeWeight_", [aWeight]);
-    myDX = smalltalk.send(self['@centerX'], "__plus", [smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.Math || Math, "_sin_", [smalltalk.send(smalltalk.send(aPosition, "__star", [2]), "__star", [smalltalk.send(smalltalk.Math || Math, "_PI", [])])]), "__star", [aLengthScale]), "__star", [self['@maxArmLength']])]);
-    myDY = smalltalk.send(self['@centerY'], "__minus", [smalltalk.send(smalltalk.send(smalltalk.send(smalltalk.Math || Math, "_cos_", [smalltalk.send(smalltalk.send(aPosition, "__star", [2]), "__star", [smalltalk.send(smalltalk.Math || Math, "_PI", [])])]), "__star", [aLengthScale]), "__star", [self['@maxArmLength']])]);
-    smalltalk.send(self['@processing'], "_line_y_dX_dy_", [self['@centerX'], self['@centerY'], myDX, myDY]);
-    return self;
-},
+fn: function (aPosition,aLengthScale,aWeight){
+var self=this;
+var myDX,myDY;
+return smalltalk.withContext(function($ctx1) { 
_st(self["@processing"])._strokeWeight_(aWeight);
+myDX=_st(self["@centerX"]).__plus(_st(_st(_st((smalltalk.Math || Math))._sin_(_st(_st(aPosition).__star((2))).__star(_st((smalltalk.Math || Math))._PI()))).__star(aLengthScale)).__star(self["@maxArmLength"]));
+myDY=_st(self["@centerY"]).__minus(_st(_st(_st((smalltalk.Math || Math))._cos_(_st(_st(aPosition).__star((2))).__star(_st((smalltalk.Math || Math))._PI()))).__star(aLengthScale)).__star(self["@maxArmLength"]));
+_st(self["@processing"])._line_y_dX_dy_(self["@centerX"],self["@centerY"],myDX,myDY);
+return self}, function($ctx1) {$ctx1.fill(self,"drawArm:lengthScale:weight:",{aPosition:aPosition,aLengthScale:aLengthScale,aWeight:aWeight,myDX:myDX,myDY:myDY}, smalltalk.ProcessingClock)})},
 args: ["aPosition", "aLengthScale", "aWeight"],
 source: "drawArm: aPosition lengthScale: aLengthScale weight: aWeight\x0a| myDX myDY |\x0aprocessing strokeWeight: aWeight.\x0amyDX := centerX \x0a\x09\x09\x09+ ((Math sin: (aPosition * 2 * Math PI))\x0a\x09\x09\x09* aLengthScale * maxArmLength).\x0amyDY := centerY \x0a\x09\x09\x09- ((Math cos: (aPosition * 2 * Math PI))\x0a\x09\x09\x09* aLengthScale * maxArmLength).\x0a\x0aprocessing line: centerX y: centerY dX: myDX dy: myDY.",
 messageSends: ["strokeWeight:", "+", "*", "sin:", "PI", "-", "cos:", "line:y:dX:dy:"],
@@ -40,22 +54,37 @@ referencedClasses: ["Math"]
 }),
 smalltalk.ProcessingClock);
 
+smalltalk.addMethod(
+"_firstProcessingInstance",
+smalltalk.method({
+selector: "firstProcessingInstance",
+category: 'not yet classified',
+fn: function (){
+var self=this;
+return smalltalk.withContext(function($ctx1) { 
return Processing.instances[0];
+return self}, function($ctx1) {$ctx1.fill(self,"firstProcessingInstance",{}, smalltalk.ProcessingClock)})},
+args: [],
+source: "firstProcessingInstance\x0a\x0a\x09<return Processing.instances[0]>",
+messageSends: [],
+referencedClasses: []
+}),
+smalltalk.ProcessingClock);
+
 smalltalk.addMethod(
 "_initialize",
 smalltalk.method({
 selector: "initialize",
 category: 'not yet classified',
-fn: function () {
-    var self = this;
-    self['@processing'] = Processing.instances[0];
-    self['@centerX'] = smalltalk.send(smalltalk.send(self['@processing'], "_width", []), "__slash", [2]);
-    self['@centerY'] = smalltalk.send(smalltalk.send(self['@processing'], "_height", []), "__slash", [2]);
-    self['@maxArmLength'] = smalltalk.send(smalltalk.Math || Math, "_min_or_", [self['@centerX'], self['@centerY']]);
-    return self;
-},
+fn: function (){
+var self=this;
+return smalltalk.withContext(function($ctx1) { 
self["@processing"]=_st(self)._firstProcessingInstance();
+self["@centerX"]=_st(_st(self["@processing"])._width()).__slash((2));
+self["@centerY"]=_st(_st(self["@processing"])._height()).__slash((2));
+self["@maxArmLength"]=_st((smalltalk.Math || Math))._min_or_(self["@centerX"],self["@centerY"]);
+return self}, function($ctx1) {$ctx1.fill(self,"initialize",{}, smalltalk.ProcessingClock)})},
 args: [],
-source: "initialize\x0aprocessing := <Processing.instances[0]>.\x0acenterX := processing width / 2.\x0acenterY := processing height / 2.\x0amaxArmLength := Math min: centerX or: centerY.",
-messageSends: ["/", "width", "height", "min:or:"],
+source: "initialize\x0aprocessing := self firstProcessingInstance.\x0acenterX := processing width / 2.\x0acenterY := processing height / 2.\x0amaxArmLength := Math min: centerX or: centerY. ",
+messageSends: ["firstProcessingInstance", "/", "width", "height", "min:or:"],
 referencedClasses: ["Math"]
 }),
 smalltalk.ProcessingClock);
@@ -65,10 +94,12 @@ smalltalk.addMethod(
 smalltalk.method({
 selector: "processing",
 category: 'not yet classified',
-fn: function () {
-    var self = this;
-    return self['@processing'];
-},
+fn: function (){
+var self=this;
+return smalltalk.withContext(function($ctx1) { 
var $1;
+$1=self["@processing"];
+return $1;
+}, function($ctx1) {$ctx1.fill(self,"processing",{}, smalltalk.ProcessingClock)})},
 args: [],
 source: "processing\x0a^processing",
 messageSends: [],
@@ -82,20 +113,17 @@ smalltalk.addMethod(
 smalltalk.method({
 selector: "init",
 category: 'not yet classified',
-fn: function () {
-    var self = this;
-    var clock;
-    var processing;
-    var block;
-    clock = smalltalk.send(smalltalk.ProcessingClock || ProcessingClock, "_new", []);
-    processing = smalltalk.send(clock, "_processing", []);
-    block = smalltalk.send(clock, "_draw", []);
-    processing.draw = block;
-    return self;
-},
+fn: function (){
+var self=this;
+var clock,processing,block;
+return smalltalk.withContext(function($ctx1) { 
clock=_st((smalltalk.ProcessingClock || ProcessingClock))._new();
+processing=_st(clock)._processing();
+block=_st(clock)._draw();
+_st(processing)._at_put_("draw",block);
+return self}, function($ctx1) {$ctx1.fill(self,"init",{clock:clock,processing:processing,block:block}, smalltalk.ProcessingClock.klass)})},
 args: [],
-source: "init\x0a| clock processing block |\x0aclock := ProcessingClock new .\x0aprocessing := clock processing.\x0ablock := clock draw.\x0a<processing.draw=block>\x0a ",
-messageSends: ["new", "processing", "draw"],
+source: "init\x0a| clock processing block |\x0aclock := ProcessingClock new .\x0aprocessing := clock processing.\x0ablock := clock draw.\x0aprocessing at: 'draw' put: block\x0a ",
+messageSends: ["new", "processing", "draw", "at:put:"],
 referencedClasses: ["ProcessingClock"]
 }),
 smalltalk.ProcessingClock.klass);

processing/st/Processing-Examples.st

@@ -43,8 +43,13 @@ myDY := centerY
 processing line: centerX y: centerY dX: myDX dy: myDY.
 !
 
+firstProcessingInstance
+
+	<return Processing.instances[0]>
+!
+
 initialize
-processing := <Processing.instances[0]>.
+processing := self firstProcessingInstance.
 centerX := processing width / 2.
 centerY := processing height / 2.
 maxArmLength := Math min: centerX or: centerY.
@@ -61,6 +66,6 @@ init
 clock := ProcessingClock new .
 processing := clock processing.
 block := clock draw.
-<processing.draw=block>
+processing at: 'draw' put: block
 ! !