Skip to content

Commit abab541

Browse files
committed
add p5utils.js file
1 parent efa6675 commit abab541

File tree

5 files changed

+40
-25
lines changed

5 files changed

+40
-25
lines changed

index.html

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040

4141
<script src="lib/Tone.js" defer></script>
4242

43+
<script src="lib/p5.min.js" defer></script>
44+
4345
<script src="lib/midi.js" defer></script>
4446

4547
<script src="lib/jquery.ruler.js" defer></script>

js/activity.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ let MYDEFINES = [
9494
"activity/SaveInterface",
9595
"utils/musicutils",
9696
"utils/synthutils",
97+
"utils/p5utils",
9798
"utils/mathutils",
9899
"activity/pastebox",
99100
"prefixfree.min",

js/blocks/SensorsBlocks.js

Lines changed: 27 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -718,31 +718,33 @@ function setupSensorsBlocks(activity) {
718718
* @returns {number} - The argument value representing the color.
719719
*/
720720
arg(logo, turtle) {
721-
const wasVisible = activity.turtles.turtleList[turtle].container.visible;
722-
activity.turtles.turtleList[turtle].container.visible = false;
723-
const x = activity.turtles.turtleList[turtle].container.x;
724-
const y = activity.turtles.turtleList[turtle].container.y;
725-
activity.refreshCanvas();
726-
727-
const canvas = docById("overlayCanvas");
728-
const ctx = canvas.getContext("2d");
729-
const imgData = ctx.getImageData(Math.floor(x), Math.floor(y), 1, 1).data;
730-
let color = searchColors(imgData[0], imgData[1], imgData[2]);
731-
732-
if (imgData[3] === 0) {
733-
color = platformColor.background
734-
.substring(
735-
platformColor.background.indexOf("(") + 1,
736-
platformColor.background.lastIndexOf(")")
737-
)
738-
.split(/,\s*/);
739-
color = searchColors(color[0], color[1], color[2]);
740-
}
741-
742-
if (wasVisible) {
743-
activity.turtles.turtleList[turtle].container.visible = true;
744-
}
745-
return color;
721+
// const wasVisible = activity.turtles.turtleList[turtle].container.visible;
722+
// activity.turtles.turtleList[turtle].container.visible = false;
723+
// const x = activity.turtles.turtleList[turtle].container.x;
724+
// const y = activity.turtles.turtleList[turtle].container.y;
725+
// activity.refreshCanvas();
726+
727+
// const canvas = docById("overlayCanvas");
728+
// const ctx = canvas.getContext("2d");
729+
// const imgData = ctx.getImageData(Math.floor(x), Math.floor(y), 1, 1).data;
730+
// let color = searchColors(imgData[0], imgData[1], imgData[2]);
731+
732+
// if (imgData[3] === 0) {
733+
// color = platformColor.background
734+
// .substring(
735+
// platformColor.background.indexOf("(") + 1,
736+
// platformColor.background.lastIndexOf(")")
737+
// )
738+
// .split(/,\s*/);
739+
// color = searchColors(color[0], color[1], color[2]);
740+
// }
741+
742+
// if (wasVisible) {
743+
// activity.turtles.turtleList[turtle].container.visible = true;
744+
// }
745+
// return color;
746+
747+
console.log(logo.p5.hello());
746748
}
747749
}
748750

js/logo.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,8 @@ class Logo {
219219
this.synth = new Synth();
220220
this.synth.changeInTemperament = false;
221221

222+
this.p5 = new P5();
223+
222224
// Mode widget
223225
this.modeBlock = null;
224226

js/utils/p5utils.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
function P5() {
2+
3+
this.hello = () => {
4+
return 10;
5+
}
6+
7+
return this;
8+
}

0 commit comments

Comments
 (0)