Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Js docker #896

Merged
merged 5 commits into from
Sep 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
# Python compiled files
__pycache__/
*.pyc
.idea/
.idea
# webots cache files
soccer_webots/protos/*.cache
soccer_webots/protos/Soccerbot_meshes/*.cache
Expand Down
4 changes: 0 additions & 4 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
[submodule "external/webots"]
path = external/webots
url = [email protected]:utra-robosoccer/webots.git
branch = R2022b
[submodule "external/GameController"]
path = external/GameController
url = [email protected]:RoboCup-Humanoid-TC/GameController.git
Expand Down
57 changes: 0 additions & 57 deletions .idea/codeStyles/Project.xml

This file was deleted.

5 changes: 0 additions & 5 deletions .idea/codeStyles/codeStyleConfig.xml

This file was deleted.

69 changes: 0 additions & 69 deletions .idea/inspectionProfiles/Project_Default.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/inspectionProfiles/profiles_settings.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/misc.xml

This file was deleted.

8 changes: 0 additions & 8 deletions .idea/modules.xml

This file was deleted.

16 changes: 0 additions & 16 deletions .idea/remote-mappings.xml

This file was deleted.

32 changes: 0 additions & 32 deletions .idea/soccerbot.iml

This file was deleted.

16 changes: 0 additions & 16 deletions .idea/vcs.xml

This file was deleted.

1 change: 0 additions & 1 deletion external/webots
Submodule webots deleted from a5ad48
2 changes: 1 addition & 1 deletion soccerbot/launch/modules/webots.launch
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<launch>
<arg name="single" default="true" />
<env name="GAME_CONTROLLER_HOME" value="$(env HOME)/catkin_ws/src/soccerbot/external/GameController" />
<env name="WEBOTS_HOME" value="$(env HOME)/catkin_ws/src/soccerbot/external/webots" />
<env name="WEBOTS_HOME" value="/usr/local/webots" />
<env name="WEBOTS_ROBOCUP_GAME" value="$(env HOME)/catkin_ws/src/soccerbot/external/hlvs_webots/controllers/referee/game.json" />
<env name="TEAM_1_PLAYERS_ON_FIELD" value="1" if="$(arg single)" />
<env name="TEAM_2_PLAYERS_ON_FIELD" value="" if="$(arg single)" />
Expand Down
7 changes: 4 additions & 3 deletions soccerbot/scripts/webots.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#!/usr/bin/env bash
export GAME_CONTROLLER_HOME=~/catkin_ws/src/soccerbot/external/GameController/
export JAVA_HOME=/usr
cd ~/catkin_ws/src/soccerbot/external/webots || exit 1
#./webots ./../hlvs_webots/worlds/robocup.wbt
./webots ./../hlvs_webots/worlds/robocup.wbt
export WEBOTS_HOME=/usr/local/webots

cd ~/catkin_ws/src/soccerbot/external || exit 1
webots ./hlvs_webots/worlds/robocup.wbt
Loading
Loading