Fixes and updates for RobotVacuumSample Docker

- Remove autoexec.game.setreg, using game.cfg for level loading instead (#26)
- Update project.json to include 'engine_version'
- Update the Dockerfile to reflect newer tags for o3de and o3de-extras

Signed-off-by: Steve Pham <[email protected]>

Docker/Dockerfile

@@ -19,13 +19,13 @@ ARG IMAGE_TYPE=simulation  # Default to 'simulation'
 
 # Arguments for the source repos needed for the robot vacuum sample docker
 ARG O3DE_REPO=https://github.com/o3de/o3de.git
-ARG O3DE_BRANCH=606fed5
+ARG O3DE_BRANCH=3ec71ff
 
 ARG O3DE_EXTRAS_REPO=https://github.com/o3de/o3de-extras.git
-ARG O3DE_EXTRAS_BRANCH=f1d8afe
+ARG O3DE_EXTRAS_BRANCH=3464657
 
 ARG LOFT_GEM_REPO=https://github.com/o3de/loft-arch-vis-sample.git
-ARG LOFT_GEM_BRANCH=658ad5f
+ARG LOFT_GEM_BRANCH=main
 
 ARG ROBOT_VAC_SAMPLE_REPO=https://github.com/o3de/RobotVacuumSample.git
 ARG ROBOT_VAC_SAMPLE_BRANCH=main

Docker/README.md

@@ -125,8 +125,8 @@ In addition the repositories, the following arguments target the branch, commit,
 
 | Argument                | Repository                       | Default     |
 |-------------------------|----------------------------------|-------------|
-| O3DE_BRANCH             | O3DE                             | 606fed5     |
-| O3DE_EXTRAS_BRANCH      | O3DE Extras                      | f1d8afe     |
+| O3DE_BRANCH             | O3DE                             | 3ec71ff     |
+| O3DE_EXTRAS_BRANCH      | O3DE Extras                      | 3464657     |
 | LOFT_GEM_BRANCH         | Loft ArchVis Sample Scene        | main        |
 | ROBOT_VAC_SAMPLE_BRANCH | Loft Scene Simulation repository | main        |
 

Registry/autoexec.game.setreg

@@ -1,10 +0,0 @@
-{
-    "O3DE": {
-        "Autoexec": {
-            "ConsoleCommands": {
-                "LoadLevel": "loft"
-            }
-        }
-    }
-}
-

game.cfg

@@ -1,6 +1,7 @@
 sys_game_name = "Samples"
 sys_localization_folder = Localization
 ca_useIMG_CAF = 0
+loadlevel = "loft"
 
 -- Enable warnings when asset loads take longer than the given millisecond threshold
 cl_assetLoadWarningEnable=true

project.json

@@ -20,5 +20,6 @@
     "gem_names": [
         "ROS2",
         "ArchVis"
-    ]
+    ],
+    "engine_version": "2.1.0"
 }