Skip to content

Commit b724c97

Browse files
Patrick Soquetmkellner
authored andcommitted
v-max backup
1 parent a0e4f8b commit b724c97

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

tools/mcsim/DevicePane.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ export class DeviceBehavior extends Behavior {
3030
onCreate(container, device) {
3131
this.device = device;
3232
}
33+
onMessage(message) {
34+
}
3335
}
3436

3537
export class DeviceWorker {
@@ -54,13 +56,13 @@ export class DeviceWorker {
5456
if (this.id)
5557
model.SCREEN.postMessage(message, this.id);
5658
}
57-
traceInput(message, buffer) {
59+
traceInput(message, buffer, state = 0) {
5860
let messagesPane = model.MESSAGES;
59-
messagesPane.behavior.input(messagesPane, message, buffer);
61+
messagesPane.behavior.input(messagesPane, message, buffer, state);
6062
}
61-
traceOutput(message, buffer) {
63+
traceOutput(message, buffer, state = 0) {
6264
let messagesPane = model.MESSAGES;
63-
messagesPane.behavior.output(messagesPane, message, buffer);
65+
messagesPane.behavior.output(messagesPane, message, buffer, state);
6466
}
6567
unbindContent(content) {
6668
content.active = false;
@@ -101,6 +103,8 @@ class DeviceScreenBehavior extends Behavior {
101103
if (worker)
102104
worker.onmessage(message);
103105
}
106+
else
107+
screen.container.bubble("onMessage", message);
104108
}
105109
}
106110

tools/mcsim/MessagesPane.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import {
3030
} from "assets";
3131

3232
var messageTexture = new Texture({ path:"assets/bubbles.png" });
33-
var messageOutSkin = new Skin({ texture: messageTexture, x:0, y:0, width:100, height:64, tiles:{ left:20, right:20, top:20, bottom:20 } });
34-
var messageInSkin = new Skin({ texture: messageTexture, x:100, y:0, width:100, height:64, tiles:{ left:20, right:20, top:20, bottom:20 } });
33+
var messageOutSkin = new Skin({ texture: messageTexture, x:0, y:0, width:100, height:64, tiles:{ left:20, right:20, top:20, bottom:20 }, states:64 });
34+
var messageInSkin = new Skin({ texture: messageTexture, x:100, y:0, width:100, height:64, tiles:{ left:20, right:20, top:20, bottom:20 }, states:64 });
3535
var messageListSkin = new Skin({ fill:"#e2e2e2" });
3636
const CODE_BLACK = "#000000";
3737
const CODE_COMMENT = "#008d32";
@@ -69,7 +69,7 @@ class MessagePaneBehavior extends Behavior {
6969
formatMessage(message) {
7070
return JSON.stringify(message, null, 2);
7171
}
72-
input(container, message, buffer) {
72+
input(container, message, buffer, state = 0) {
7373
var scroller = container.first;
7474
if (message)
7575
message = this.formatMessage(message);
@@ -79,10 +79,10 @@ class MessagePaneBehavior extends Behavior {
7979
buffer = this.formatBuffer(buffer);
8080
else
8181
buffer = "...";
82-
this.add(container, scroller, new MessageInLine(message));
83-
this.add(container, scroller.next, new BufferInLine(buffer));
82+
this.add(container, scroller, new MessageInLine(message, { state }));
83+
this.add(container, scroller.next, new BufferInLine(buffer, { state }));
8484
}
85-
output(container, message, buffer) {
85+
output(container, message, buffer, state = 0) {
8686
var scroller = container.first;
8787
if (message)
8888
message = this.formatMessage(message);
@@ -92,8 +92,8 @@ class MessagePaneBehavior extends Behavior {
9292
buffer = this.formatBuffer(buffer);
9393
else
9494
buffer = "...";
95-
this.add(container, scroller, new MessageOutLine(message));
96-
this.add(container, scroller.next, new BufferOutLine(buffer));
95+
this.add(container, scroller, new MessageOutLine(message, { state }));
96+
this.add(container, scroller.next, new BufferOutLine(buffer, { state }));
9797
}
9898
onEmptyMessages(container) {
9999
var scroller = container.first;

tools/mcsim/assets/bubbles.png

-12.1 KB
Loading

0 commit comments

Comments
 (0)