Skip to content

Commit

Permalink
Removed slides/vides as maybe out-of-date
Browse files Browse the repository at this point in the history
  • Loading branch information
avardy committed Nov 23, 2022
1 parent 51f3525 commit a3c0f8c
Show file tree
Hide file tree
Showing 10 changed files with 13 additions and 6 deletions.
Binary file removed SwarmRoboticsWorkshop.pdf
Binary file not shown.
Binary file removed SwarmRoboticsWorkshop.pptx
Binary file not shown.
8 changes: 6 additions & 2 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,15 @@
<body>
<h2>Waggle 1.2: The Online Swarm Robotics Lab</h2>

<p>Waggle is a web application allowing you to visually program a simulated robot swarm. Its primary purpose is to provide a gentle introduction to the field of Swarm Robotics. The following slides introduce Swarm Robotics and guide you through visual programming exercises using Waggle:</p>
<p>Waggle is a web application allowing you to visually program a simulated robot swarm. Its primary purpose is to provide a gentle introduction to the field of Swarm Robotics.

<!-- The following slides introduce Swarm Robotics and guide you through visual programming exercises using Waggle:</p>
<ul>
<li><a href="SwarmRoboticsWorkshop.pptx">Slides [Powerpoint, 95 MB, Updated 17 Jan.]</a></li>
<li><a href="SwarmRoboticsWorkshop.pdf">Slides [PDF, 34 MB, No videos, Updated 17 Jan.]</a></li>
</ul>
-->

<p>Waggle has a number of different levels focussing on different problems studied in Swarm Robotics. You are suggested to read through the slides posted above and go to the links below when prompted:</p>

Expand All @@ -35,7 +38,8 @@ <h2>Waggle 1.2: The Online Swarm Robotics Lab</h2>
<li><a href="waggle.html#PHEROMONE"><b>Pheromones</b></a>: Ant-inspired pheromone trail following</li>
</ul>

<p>Note that Waggle is not a self-contained tutorial application. The slides provide the background and context while the Waggle application provides the simulation and programming environment.</p>
<!-- <p>Note that Waggle is not a self-contained tutorial application. The slides provide the background and context while the Waggle application provides the simulation and programming environment.</p>
-->

The following demo controllers can be downloaded and then loaded into Waggle:
<ul>
Expand Down
4 changes: 2 additions & 2 deletions js/CustomRender.js
Original file line number Diff line number Diff line change
Expand Up @@ -471,8 +471,8 @@ var Mouse = Matter.Mouse;
// if (metrics.timing) {
// text += "fps: " + Math.round(metrics.timing.fps) + space;
// }
text += "render delta (ms): " + Math.round(Date.now() - (render.debugTimestamp));
text += "\nelapsed (ms): " + simState.clockElapsed;
//text += "render delta (ms): " + Math.round(Date.now() - (render.debugTimestamp));
//text += "\nelapsed (ms): " + simState.clockElapsed;


render.debugString = text;
Expand Down
3 changes: 2 additions & 1 deletion js/my_globals.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,6 @@ var myGlobals = {
resetAfterMaxStep: false,
showPheromoneGrid: false,
showNestGrid: false,
renderSkip: 1
renderSkip: 1,
controllerString: "OrbitalConstructionController"
};
Binary file removed videos/Cache Consensus- Trial 1 - 3.mp4
Binary file not shown.
Binary file removed videos/avoid_obstacles_300_300.mov
Binary file not shown.
Binary file removed videos/fireflies_in_thailand.mp4
Binary file not shown.
Binary file removed videos/firefly_communication.mp4
Binary file not shown.
4 changes: 3 additions & 1 deletion waggle.html
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ <h2>Waggle 1.2: The Online Swarm Robotics Lab</h2>
<div class="tab">
<button class="tablinks" id="blocklyTabButton" onclick="openTab(event, 'blocklyTab')">Blockly</button>
<button class="tablinks" id="javascriptTabButton" onclick="openTab(event, 'javascriptTab')">Javascript</button>
<button class="tablinks" id="hardcodedTabButton" onclick="openTab(event, 'hardcodedTab')">Hard-Coded</button>
<!-- <button class="tablinks" id="hardcodedTabButton" onclick="openTab(event, 'hardcodedTab')">Hard-Coded</button> -->
</div>

<div class="tabcontent" id="blocklyTab">
Expand Down Expand Up @@ -400,8 +400,10 @@ <h2>Waggle 1.2: The Online Swarm Robotics Lab</h2>
</div>
</div>

<!--
<div class="tabcontent" id="hardcodedTab">
</div>
-->

</div>

Expand Down

0 comments on commit a3c0f8c

Please sign in to comment.