Răsfoiți Sursa

- Updates based on running latest o3de project creation script
- Remove BEGIN/END License tags in comment headers
- Add ArchVis Gem for the Loft Scene Assets

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

Steve Pham 3 ani în urmă
părinte
comite
1049ac8796
39 a modificat fișierele cu 452 adăugiri și 87 ștergeri
  1. 158 0
      Assets/Physics/SurfaceTypeMaterialLibrary.physmaterial
  2. 2 2
      CMakeLists.txt
  3. 3 3
      Gem/CMakeLists.txt
  4. 1 4
      Gem/Include/ROS2-Gem-Demo/ROS2-Gem-DemoBus.h
  5. 2 2
      Gem/Platform/Android/PAL_android.cmake
  6. 2 2
      Gem/Platform/Android/ros2-gem-demo_android_files.cmake
  7. 2 2
      Gem/Platform/Android/ros2-gem-demo_shared_android_files.cmake
  8. 2 2
      Gem/Platform/Linux/PAL_linux.cmake
  9. 2 2
      Gem/Platform/Linux/ros2-gem-demo_linux_files.cmake
  10. 2 2
      Gem/Platform/Linux/ros2-gem-demo_shared_linux_files.cmake
  11. 2 2
      Gem/Platform/Mac/PAL_mac.cmake
  12. 1 1
      Gem/Platform/Mac/ros2-gem-demo_mac_files.cmake
  13. 2 2
      Gem/Platform/Mac/ros2-gem-demo_shared_mac_files.cmake
  14. 2 2
      Gem/Platform/Windows/PAL_windows.cmake
  15. 2 2
      Gem/Platform/Windows/ros2-gem-demo_shared_windows_files.cmake
  16. 2 2
      Gem/Platform/Windows/ros2-gem-demo_windows_files.cmake
  17. 2 2
      Gem/Platform/iOS/PAL_ios.cmake
  18. 2 2
      Gem/Platform/iOS/ros2-gem-demo_ios_files.cmake
  19. 2 2
      Gem/Platform/iOS/ros2-gem-demo_shared_ios_files.cmake
  20. 1 3
      Gem/Source/ROS2-Gem-DemoModule.cpp
  21. 0 2
      Gem/Source/ROS2-Gem-DemoSystemComponent.cpp
  22. 1 3
      Gem/Source/ROS2-Gem-DemoSystemComponent.h
  23. 3 2
      Gem/enabled_gems.cmake
  24. 2 2
      Gem/ros2-gem-demo_files.cmake
  25. 2 2
      Gem/ros2-gem-demo_shared_files.cmake
  26. 2 3
      Platform/Android/android_project.cmake
  27. 2 3
      Platform/Linux/linux_project.cmake
  28. 2 3
      Platform/Mac/mac_project.cmake
  29. 2 3
      Platform/Windows/windows_project.cmake
  30. 2 3
      Platform/iOS/ios_project.cmake
  31. 100 12
      README.md
  32. 10 0
      Registry/bootstrap.setreg
  33. 11 0
      Registry/physxdebugconfiguration.setreg
  34. 9 0
      Registry/physxdefaultsceneconfiguration.setreg
  35. 105 0
      Registry/physxsystemconfiguration.setreg
  36. 0 2
      ShaderLib/scenesrg.srgi
  37. 0 2
      ShaderLib/viewsrg.srgi
  38. 2 2
      cmake/EngineFinder.cmake
  39. 3 2
      project.json

+ 158 - 0
Assets/Physics/SurfaceTypeMaterialLibrary.physmaterial

@@ -0,0 +1,158 @@
+<ObjectStream version="3">
+	<Class name="Physics::MaterialLibraryAsset" version="2" type="{9E366D8C-33BB-4825-9A1F-FA3ADBE11D0F}">
+		<Class name="AssetData" field="BaseClass1" version="1" type="{AF3F7D32-1536-422A-89F3-A11E1F5B5A9C}"/>
+		<Class name="AZStd::vector" field="Properties" type="{A8E59F8C-2F9A-525A-B549-A9E197EB9632}">
+			<Class name="Physics::MaterialFromAssetConfiguration" field="element" version="1" type="{FBD76628-DE57-435E-BE00-6FFAE64DDF1D}">
+				<Class name="Physics::MaterialConfiguration" field="Configuration" version="3" type="{8807CAA1-AD08-4238-8FDB-2154ADD084A1}">
+					<Class name="AZStd::string" field="SurfaceType" value="Character" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+					<Class name="float" field="DynamicFriction" value="0.7000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="float" field="StaticFriction" value="0.8000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="float" field="Restitution" value="0.3000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="unsigned char" field="FrictionCombine" value="2" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+					<Class name="unsigned char" field="RestitutionCombine" value="3" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+					<Class name="float" field="Density" value="985.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="Color" field="DebugColor" value="0.9183642 0.6973526 0.4447700 1.0000000" type="{7894072A-9050-4F0F-901B-34B1A0D29417}"/>
+				</Class>
+				<Class name="Physics::MaterialId" field="UID" version="1" type="{744CCE6C-9F69-4E2F-B950-DAB8514F870B}">
+					<Class name="AZ::Uuid" field="MaterialId" value="{FDECD8B6-5BAF-42CB-AEFE-C66E1E1CF557}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+				</Class>
+			</Class>
+			<Class name="Physics::MaterialFromAssetConfiguration" field="element" version="1" type="{FBD76628-DE57-435E-BE00-6FFAE64DDF1D}">
+				<Class name="Physics::MaterialConfiguration" field="Configuration" version="3" type="{8807CAA1-AD08-4238-8FDB-2154ADD084A1}">
+					<Class name="AZStd::string" field="SurfaceType" value="Concrete" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+					<Class name="float" field="DynamicFriction" value="0.8000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="float" field="StaticFriction" value="0.9000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="float" field="Restitution" value="0.3800000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="unsigned char" field="FrictionCombine" value="3" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+					<Class name="unsigned char" field="RestitutionCombine" value="0" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+					<Class name="float" field="Density" value="2400.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="Color" field="DebugColor" value="0.5918365 0.4927596 0.3795224 1.0000000" type="{7894072A-9050-4F0F-901B-34B1A0D29417}"/>
+				</Class>
+				<Class name="Physics::MaterialId" field="UID" version="1" type="{744CCE6C-9F69-4E2F-B950-DAB8514F870B}">
+					<Class name="AZ::Uuid" field="MaterialId" value="{A9CACCFF-E0D2-4149-8891-E92319229B2D}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+				</Class>
+			</Class>
+			<Class name="Physics::MaterialFromAssetConfiguration" field="element" version="1" type="{FBD76628-DE57-435E-BE00-6FFAE64DDF1D}">
+				<Class name="Physics::MaterialConfiguration" field="Configuration" version="3" type="{8807CAA1-AD08-4238-8FDB-2154ADD084A1}">
+					<Class name="AZStd::string" field="SurfaceType" value="Glass" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+					<Class name="float" field="DynamicFriction" value="0.4000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="float" field="StaticFriction" value="0.5000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="float" field="Restitution" value="0.7000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="unsigned char" field="FrictionCombine" value="3" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+					<Class name="unsigned char" field="RestitutionCombine" value="0" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+					<Class name="float" field="Density" value="2500.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="Color" field="DebugColor" value="0.4825971 0.8975662 0.9523766 1.0000000" type="{7894072A-9050-4F0F-901B-34B1A0D29417}"/>
+				</Class>
+				<Class name="Physics::MaterialId" field="UID" version="1" type="{744CCE6C-9F69-4E2F-B950-DAB8514F870B}">
+					<Class name="AZ::Uuid" field="MaterialId" value="{FD59CBE9-D1C4-4119-81CB-CD7AD72FC295}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+				</Class>
+			</Class>
+			<Class name="Physics::MaterialFromAssetConfiguration" field="element" version="1" type="{FBD76628-DE57-435E-BE00-6FFAE64DDF1D}">
+				<Class name="Physics::MaterialConfiguration" field="Configuration" version="3" type="{8807CAA1-AD08-4238-8FDB-2154ADD084A1}">
+					<Class name="AZStd::string" field="SurfaceType" value="Metal" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+					<Class name="float" field="DynamicFriction" value="0.4200000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="float" field="StaticFriction" value="0.7800000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="float" field="Restitution" value="0.4000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="unsigned char" field="FrictionCombine" value="0" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+					<Class name="unsigned char" field="RestitutionCombine" value="0" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+					<Class name="float" field="Density" value="8050.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="Color" field="DebugColor" value="0.2312963 0.2312963 0.2312963 1.0000000" type="{7894072A-9050-4F0F-901B-34B1A0D29417}"/>
+				</Class>
+				<Class name="Physics::MaterialId" field="UID" version="1" type="{744CCE6C-9F69-4E2F-B950-DAB8514F870B}">
+					<Class name="AZ::Uuid" field="MaterialId" value="{76CDC778-ACA9-449F-BFD7-C361F89F3207}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+				</Class>
+			</Class>
+			<Class name="Physics::MaterialFromAssetConfiguration" field="element" version="1" type="{FBD76628-DE57-435E-BE00-6FFAE64DDF1D}">
+				<Class name="Physics::MaterialConfiguration" field="Configuration" version="3" type="{8807CAA1-AD08-4238-8FDB-2154ADD084A1}">
+					<Class name="AZStd::string" field="SurfaceType" value="Plastic" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+					<Class name="float" field="DynamicFriction" value="0.3500000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="float" field="StaticFriction" value="0.3000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="float" field="Restitution" value="0.6900000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="unsigned char" field="FrictionCombine" value="3" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+					<Class name="unsigned char" field="RestitutionCombine" value="0" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+					<Class name="float" field="Density" value="900.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="Color" field="DebugColor" value="0.9394675 1.0000000 0.2735485 1.0000000" type="{7894072A-9050-4F0F-901B-34B1A0D29417}"/>
+				</Class>
+				<Class name="Physics::MaterialId" field="UID" version="1" type="{744CCE6C-9F69-4E2F-B950-DAB8514F870B}">
+					<Class name="AZ::Uuid" field="MaterialId" value="{E2FFB000-D15B-4760-A819-9E490D1D3741}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+				</Class>
+			</Class>
+			<Class name="Physics::MaterialFromAssetConfiguration" field="element" version="1" type="{FBD76628-DE57-435E-BE00-6FFAE64DDF1D}">
+				<Class name="Physics::MaterialConfiguration" field="Configuration" version="3" type="{8807CAA1-AD08-4238-8FDB-2154ADD084A1}">
+					<Class name="AZStd::string" field="SurfaceType" value="Rubber" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+					<Class name="float" field="DynamicFriction" value="1.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="float" field="StaticFriction" value="1.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="float" field="Restitution" value="0.8500000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="unsigned char" field="FrictionCombine" value="3" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+					<Class name="unsigned char" field="RestitutionCombine" value="0" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+					<Class name="float" field="Density" value="1200.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="Color" field="DebugColor" value="0.1088426 0.1088426 0.1088426 1.0000000" type="{7894072A-9050-4F0F-901B-34B1A0D29417}"/>
+				</Class>
+				<Class name="Physics::MaterialId" field="UID" version="1" type="{744CCE6C-9F69-4E2F-B950-DAB8514F870B}">
+					<Class name="AZ::Uuid" field="MaterialId" value="{8C7A6011-61C2-46B7-9BF4-8D4DD2A624F1}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+				</Class>
+			</Class>
+			<Class name="Physics::MaterialFromAssetConfiguration" field="element" version="1" type="{FBD76628-DE57-435E-BE00-6FFAE64DDF1D}">
+				<Class name="Physics::MaterialConfiguration" field="Configuration" version="3" type="{8807CAA1-AD08-4238-8FDB-2154ADD084A1}">
+					<Class name="AZStd::string" field="SurfaceType" value="Terrain_Dirt" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+					<Class name="float" field="DynamicFriction" value="0.4000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="float" field="StaticFriction" value="0.4000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="float" field="Restitution" value="0.3000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="unsigned char" field="FrictionCombine" value="0" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+					<Class name="unsigned char" field="RestitutionCombine" value="3" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+					<Class name="float" field="Density" value="1600.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="Color" field="DebugColor" value="0.3333333 0.2619974 0.1973144 1.0000000" type="{7894072A-9050-4F0F-901B-34B1A0D29417}"/>
+				</Class>
+				<Class name="Physics::MaterialId" field="UID" version="1" type="{744CCE6C-9F69-4E2F-B950-DAB8514F870B}">
+					<Class name="AZ::Uuid" field="MaterialId" value="{303C5A49-22F2-45A8-B24C-9F2C3CA13402}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+				</Class>
+			</Class>
+			<Class name="Physics::MaterialFromAssetConfiguration" field="element" version="1" type="{FBD76628-DE57-435E-BE00-6FFAE64DDF1D}">
+				<Class name="Physics::MaterialConfiguration" field="Configuration" version="3" type="{8807CAA1-AD08-4238-8FDB-2154ADD084A1}">
+					<Class name="AZStd::string" field="SurfaceType" value="Terrain_Grass" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+					<Class name="float" field="DynamicFriction" value="0.2500000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="float" field="StaticFriction" value="0.3500000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="float" field="Restitution" value="0.2000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="unsigned char" field="FrictionCombine" value="3" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+					<Class name="unsigned char" field="RestitutionCombine" value="0" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+					<Class name="float" field="Density" value="1400.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="Color" field="DebugColor" value="0.1483177 0.5986419 0.1073777 1.0000000" type="{7894072A-9050-4F0F-901B-34B1A0D29417}"/>
+				</Class>
+				<Class name="Physics::MaterialId" field="UID" version="1" type="{744CCE6C-9F69-4E2F-B950-DAB8514F870B}">
+					<Class name="AZ::Uuid" field="MaterialId" value="{53733840-A095-40C4-B653-C40D233B3BE1}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+				</Class>
+			</Class>
+			<Class name="Physics::MaterialFromAssetConfiguration" field="element" version="1" type="{FBD76628-DE57-435E-BE00-6FFAE64DDF1D}">
+				<Class name="Physics::MaterialConfiguration" field="Configuration" version="3" type="{8807CAA1-AD08-4238-8FDB-2154ADD084A1}">
+					<Class name="AZStd::string" field="SurfaceType" value="Vehicle" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+					<Class name="float" field="DynamicFriction" value="0.2000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="float" field="StaticFriction" value="0.5000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="float" field="Restitution" value="0.3000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="unsigned char" field="FrictionCombine" value="1" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+					<Class name="unsigned char" field="RestitutionCombine" value="1" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+					<Class name="float" field="Density" value="140.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="Color" field="DebugColor" value="1.0000000 0.0000000 0.0000000 1.0000000" type="{7894072A-9050-4F0F-901B-34B1A0D29417}"/>
+				</Class>
+				<Class name="Physics::MaterialId" field="UID" version="1" type="{744CCE6C-9F69-4E2F-B950-DAB8514F870B}">
+					<Class name="AZ::Uuid" field="MaterialId" value="{4080A6D4-AF4E-41CE-B7C9-7699C07123E7}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+				</Class>
+			</Class>
+			<Class name="Physics::MaterialFromAssetConfiguration" field="element" version="1" type="{FBD76628-DE57-435E-BE00-6FFAE64DDF1D}">
+				<Class name="Physics::MaterialConfiguration" field="Configuration" version="3" type="{8807CAA1-AD08-4238-8FDB-2154ADD084A1}">
+					<Class name="AZStd::string" field="SurfaceType" value="Wood" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
+					<Class name="float" field="DynamicFriction" value="0.5000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="float" field="StaticFriction" value="0.6000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="float" field="Restitution" value="0.6000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="unsigned char" field="FrictionCombine" value="3" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+					<Class name="unsigned char" field="RestitutionCombine" value="0" type="{72B9409A-7D1A-4831-9CFE-FCB3FADD3426}"/>
+					<Class name="float" field="Density" value="540.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+					<Class name="Color" field="DebugColor" value="1.0000000 0.7318379 0.3004501 1.0000000" type="{7894072A-9050-4F0F-901B-34B1A0D29417}"/>
+				</Class>
+				<Class name="Physics::MaterialId" field="UID" version="1" type="{744CCE6C-9F69-4E2F-B950-DAB8514F870B}">
+					<Class name="AZ::Uuid" field="MaterialId" value="{6ACE67AA-CB32-41CD-8740-58371CCCD3F3}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
+				</Class>
+			</Class>
+		</Class>
+	</Class>
+</ObjectStream>
+

+ 2 - 2
CMakeLists.txt

@@ -1,4 +1,4 @@
-# {BEGIN_LICENSE}
+#
 #
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
@@ -6,7 +6,7 @@
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
 #
-# {END_LICENSE}
+#
 
 if(NOT PROJECT_NAME)
     cmake_minimum_required(VERSION 3.20)

+ 3 - 3
Gem/CMakeLists.txt

@@ -1,10 +1,10 @@
-# {BEGIN_LICENSE}
+#
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
 #
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
-# {END_LICENSE}
+#
 
 set(gem_path ${CMAKE_CURRENT_LIST_DIR})
 set(gem_json ${gem_path}/gem.json)
@@ -16,7 +16,7 @@ o3de_restricted_path(${gem_json} gem_restricted_path gem_parent_relative_path)
 #       in which case it will see if that platform is present here or in the restricted folder.
 #       i.e. It could here : ROS2-Gem-Demo/Code/Platform/<platform_name>  or
 #            <restricted_folder>/<platform_name>/ROS2-Gem-Demo/Code
-o3de_pal_dir(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME} ${gem_restricted_path} ${gem_path} ${gem_parent_relative_path})
+o3de_pal_dir(pal_dir ${CMAKE_CURRENT_LIST_DIR}/Platform/${PAL_PLATFORM_NAME} "${gem_restricted_path}" "${gem_path}" "${gem_parent_relative_path}")
 
 # Now that we have the platform abstraction layer (PAL) folder for this folder, thats where we will find the
 # traits for this platform. Traits for a platform are defines for things like whether or not something in this project

+ 1 - 4
Gem/Include/ROS2-Gem-Demo/ROS2-Gem-DemoBus.h

@@ -1,4 +1,3 @@
-// {BEGIN_LICENSE}
 /*
  * Copyright (c) Contributors to the Open 3D Engine Project.
  * For complete copyright and license terms please see the LICENSE at the root of this distribution.
@@ -6,8 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-// {END_LICENSE}
-
 #pragma once
 
 #include <AzCore/EBus/EBus.h>
@@ -18,7 +15,7 @@ namespace ROS2_Gem_Demo
     class ROS2_Gem_DemoRequests
     {
     public:
-        AZ_RTTI(ROS2_Gem_DemoRequests, "{0347d2ff-c2db-471f-8ad2-0408d808cc91}");
+        AZ_RTTI(ROS2_Gem_DemoRequests, "{16673c77-215c-41c6-8bbf-6cd2412568e9}");
         virtual ~ROS2_Gem_DemoRequests() = default;
         // Put your public methods here
     };

+ 2 - 2
Gem/Platform/Android/PAL_android.cmake

@@ -1,9 +1,9 @@
-# {BEGIN_LICENSE}
+#
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
 #
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
-# {END_LICENSE}
+#
 
 set(PAL_TRAIT_ROS2-GEM-DEMO_SUPPORTED TRUE)

+ 2 - 2
Gem/Platform/Android/ros2-gem-demo_android_files.cmake

@@ -1,10 +1,10 @@
-# {BEGIN_LICENSE}
+#
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
 #
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
-# {END_LICENSE}
+#
 
 set(FILES
     PAL_android.cmake

+ 2 - 2
Gem/Platform/Android/ros2-gem-demo_shared_android_files.cmake

@@ -1,10 +1,10 @@
-# {BEGIN_LICENSE}
+#
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
 #
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
-# {END_LICENSE}
+#
 
 set(FILES
 )

+ 2 - 2
Gem/Platform/Linux/PAL_linux.cmake

@@ -1,9 +1,9 @@
-# {BEGIN_LICENSE}
+#
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
 #
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
-# {END_LICENSE}
+#
 
 set(PAL_TRAIT_ROS2-GEM-DEMO_SUPPORTED TRUE)

+ 2 - 2
Gem/Platform/Linux/ros2-gem-demo_linux_files.cmake

@@ -1,10 +1,10 @@
-# {BEGIN_LICENSE}
+#
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
 #
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
-# {END_LICENSE}
+#
 
 set(FILES
     PAL_linux.cmake

+ 2 - 2
Gem/Platform/Linux/ros2-gem-demo_shared_linux_files.cmake

@@ -1,10 +1,10 @@
-# {BEGIN_LICENSE}
+#
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
 #
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
-# {END_LICENSE}
+#
 
 set(FILES
 )

+ 2 - 2
Gem/Platform/Mac/PAL_mac.cmake

@@ -1,9 +1,9 @@
-# {BEGIN_LICENSE}
+#
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
 #
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
-# {END_LICENSE}
+#
 
 set(PAL_TRAIT_ROS2-GEM-DEMO_SUPPORTED TRUE)

+ 1 - 1
Gem/Platform/Mac/ros2-gem-demo_mac_files.cmake

@@ -1,4 +1,4 @@
-# {BEGIN_LICENSE}
+#
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
 #

+ 2 - 2
Gem/Platform/Mac/ros2-gem-demo_shared_mac_files.cmake

@@ -1,10 +1,10 @@
-# {BEGIN_LICENSE}
+#
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
 #
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
-# {END_LICENSE}
+#
 
 set(FILES
     ../../../Resources/Platform/Mac/Info.plist

+ 2 - 2
Gem/Platform/Windows/PAL_windows.cmake

@@ -1,9 +1,9 @@
-# {BEGIN_LICENSE}
+#
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
 #
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
-# {END_LICENSE}
+#
 
 set(PAL_TRAIT_ROS2-GEM-DEMO_SUPPORTED TRUE)

+ 2 - 2
Gem/Platform/Windows/ros2-gem-demo_shared_windows_files.cmake

@@ -1,10 +1,10 @@
-# {BEGIN_LICENSE}
+#
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
 #
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
-# {END_LICENSE}
+#
 
 set(FILES
 )

+ 2 - 2
Gem/Platform/Windows/ros2-gem-demo_windows_files.cmake

@@ -1,10 +1,10 @@
-# {BEGIN_LICENSE}
+#
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
 #
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
-# {END_LICENSE}
+#
 
 set(FILES
     PAL_windows.cmake

+ 2 - 2
Gem/Platform/iOS/PAL_ios.cmake

@@ -1,9 +1,9 @@
-# {BEGIN_LICENSE}
+#
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
 #
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
-# {END_LICENSE}
+#
 
 set(PAL_TRAIT_ROS2-GEM-DEMO_SUPPORTED TRUE)

+ 2 - 2
Gem/Platform/iOS/ros2-gem-demo_ios_files.cmake

@@ -1,10 +1,10 @@
-# {BEGIN_LICENSE}
+#
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
 #
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
-# {END_LICENSE}
+#
 
 set(FILES
     ../../../Resources/Platform/iOS/Info.plist

+ 2 - 2
Gem/Platform/iOS/ros2-gem-demo_shared_ios_files.cmake

@@ -1,10 +1,10 @@
-# {BEGIN_LICENSE}
+#
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
 #
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
-# {END_LICENSE}
+#
 
 set(FILES
 )

+ 1 - 3
Gem/Source/ROS2-Gem-DemoModule.cpp

@@ -1,4 +1,3 @@
-// {BEGIN_LICENSE}
 /*
  * Copyright (c) Contributors to the Open 3D Engine Project.
  * For complete copyright and license terms please see the LICENSE at the root of this distribution.
@@ -6,7 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
- // {END_LICENSE}
 
 #include <AzCore/Memory/SystemAllocator.h>
 #include <AzCore/Module/Module.h>
@@ -19,7 +17,7 @@ namespace ROS2_Gem_Demo
         : public AZ::Module
     {
     public:
-        AZ_RTTI(ROS2_Gem_DemoModule, "{ebbd7642-5b1d-4ecb-901e-f0d52146528b}", AZ::Module);
+        AZ_RTTI(ROS2_Gem_DemoModule, "{0ea31247-8ee5-491d-93cb-296a6c91c995}", AZ::Module);
         AZ_CLASS_ALLOCATOR(ROS2_Gem_DemoModule, AZ::SystemAllocator, 0);
 
         ROS2_Gem_DemoModule()

+ 0 - 2
Gem/Source/ROS2-Gem-DemoSystemComponent.cpp

@@ -1,4 +1,3 @@
-// {BEGIN_LICENSE}
 /*
  * Copyright (c) Contributors to the Open 3D Engine Project.
  * For complete copyright and license terms please see the LICENSE at the root of this distribution.
@@ -6,7 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
- // {END_LICENSE}
 
 #include <AzCore/Serialization/SerializeContext.h>
 #include <AzCore/Serialization/EditContext.h>

+ 1 - 3
Gem/Source/ROS2-Gem-DemoSystemComponent.h

@@ -1,4 +1,3 @@
-// {BEGIN_LICENSE}
 /*
  * Copyright (c) Contributors to the Open 3D Engine Project.
  * For complete copyright and license terms please see the LICENSE at the root of this distribution.
@@ -6,7 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
- // {END_LICENSE}
 
 #pragma once
 
@@ -21,7 +19,7 @@ namespace ROS2_Gem_Demo
         , protected ROS2_Gem_DemoRequestBus::Handler
     {
     public:
-        AZ_COMPONENT(ROS2_Gem_DemoSystemComponent, "{24d1ad58-703b-4153-bcf7-0d8d2f83d25f}");
+        AZ_COMPONENT(ROS2_Gem_DemoSystemComponent, "{c5c1e616-e0bd-4b49-afd0-053756e0f455}");
 
         static void Reflect(AZ::ReflectContext* context);
 

+ 3 - 2
Gem/enabled_gems.cmake

@@ -1,10 +1,10 @@
-# {BEGIN_LICENSE}
+#
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
 #
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
-# {END_LICENSE}
+#
 
 set(ENABLED_GEMS
     ROS2-Gem-Demo
@@ -29,4 +29,5 @@ set(ENABLED_GEMS
     TextureAtlas
     WhiteBox
     ROS2
+    ArchVis
 )

+ 2 - 2
Gem/ros2-gem-demo_files.cmake

@@ -1,10 +1,10 @@
-# {BEGIN_LICENSE}
+#
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
 #
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
-# {END_LICENSE}
+#
 
 set(FILES
     Include/ROS2-Gem-Demo/ROS2-Gem-DemoBus.h

+ 2 - 2
Gem/ros2-gem-demo_shared_files.cmake

@@ -1,10 +1,10 @@
-# {BEGIN_LICENSE}
+#
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
 #
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
-# {END_LICENSE}
+#
 
 set(FILES
     Source/ROS2-Gem-DemoModule.cpp

+ 2 - 3
Platform/Android/android_project.cmake

@@ -1,8 +1,7 @@
-# {BEGIN_LICENSE}
+#
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
 #
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
-# {END_LICENSE}
-
+#

+ 2 - 3
Platform/Linux/linux_project.cmake

@@ -1,8 +1,7 @@
-# {BEGIN_LICENSE}
+#
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
 #
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
-# {END_LICENSE}
-
+#

+ 2 - 3
Platform/Mac/mac_project.cmake

@@ -1,8 +1,7 @@
-# {BEGIN_LICENSE}
+#
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
 #
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
-# {END_LICENSE}
-
+#

+ 2 - 3
Platform/Windows/windows_project.cmake

@@ -1,8 +1,7 @@
-# {BEGIN_LICENSE}
+#
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
 #
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
-# {END_LICENSE}
-
+#

+ 2 - 3
Platform/iOS/ios_project.cmake

@@ -1,8 +1,7 @@
-# {BEGIN_LICENSE}
+#
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
 #
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
-# {END_LICENSE}
-
+#

+ 100 - 12
README.md

@@ -1,25 +1,113 @@
 # RobotVacuumSample
 
-Requires [o3de-ros2-gem](https://github.com/RobotecAI/o3de-ros2-gem) to run. Follow these steps to register the game with your o3de engine:
+This project will demonstrate the ROS2 Gems and O3DE using assets from the Loft demo scene
+
+## Requirements
+
+Refer to the [O3DE System Requirements](https://www.o3de.org/docs/welcome-guide/requirements/) documentation to make sure that the system/hardware requirements are met
+
+This project has the following dependencies
+
+
+- [O3DE](https://github.com/o3de/o3de) 
+- [ROS2 Gem](https://github.com/RobotecAI/o3de-ros2-gem)
+- [Loft Scene Sample](https://github.com/aws-lumberyard/loft-arch-vis-sample)
+
+
+## Setup Instructions
+
+The following steps will assume the following
+
+- All of the requirements are met
+- You have permissions to all of the github repos descripted in the requirements
+- The instructions will be based off of a common base folder: $DEMO_BASE. For the steps below, we will set DEMO_BASE to ~/github. 
+- This current project has been fetched to $DEMO_BASE
+
+
+
+### 1. Clone O3DE (or install) and register the engine
+
+
+```
+
+$ cd $DEMO_BASE
+
+
+~/github$ git clone https://github.com/o3de/o3de.git
+
+~/github$ cd o3de
+
+~/github/o3de$ git lfs install
+
+~/github/o3de$ git lfs pull
+
+~/github/o3de$ scripts/o3de.sh register --this-engine
+
+```
+
+
+### 2. Clone and register the ROS2 Gem locally
+
+
+```
+
+$ cd $DEMO_BASE
+
+~/github$ git clone https://github.com/RobotecAI/o3de-ros2-gem.git
+
+~/github$ $DEMO_BASE/o3de/scripts/o3de.sh register --gem-path $DEMO_BASE/o3de-ros2-gem
 
-follow instructions to setup o3de engine:
-- clone o3de-ros2-gem
-- clone this project
 
-In o3de folder:
 ```
-scripts/o3de.sh register --gem-path <PATH_TO_GEM>
-scripts/o3de.sh enable-gem -gn ROS2 -pp <PATH_TO_PROJECT>
+
+### 3. Clone and register the Loft Scene project locally
+
+
 ```
 
-In project folder:
+$ cd $DEMO_BASE
+
+~/github$ git clone https://github.com/aws-lumberyard/loft-arch-vis-sample.git
+
+~/github$ cd loft-arch-vis-sample
+
+~/github/loft-arch-vis-sample$ git lfs install
+
+~/github/loft-arch-vis-sample$ git lfs pull
+
+~/github$ $DEMO_BASE/o3de/scripts/o3de.sh register --gem-path $DEMO_BASE/loft-arch-vis-sample/Gems/ArchVis
+
 ```
-cmake -B build/linux -S . -G "Ninja Multi-Config" -DLY_3RDPARTY_PATH=$HOME/o3de-packages
-cmake --build build/linux --target <ProjectName>.GameLauncher Editor --config profile -j 4
+
+### 4. Register this project and build it
+
 ```
+$ cd $DEMO_BASE
+
+~/github$ o3de/scripts/o3de.sh register -pp $DEMO_BASE/o3de-demo-project
+
+~/github$ cd o3de-demo-project
+
+~/github/o3de-demo-project$ cmake -B build/linux -G "Ninja Multi-Config" -DLY_UNITY_BUILD=OFF -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DLY_PARALLEL_LINK_JOBS=16 -DLY_STRIP_DEBUG_SYMBOLS=OFF
+
+~/github/o3de-demo-project$ cmake --build build/linux --config profile --target ROS2-Gem-Demo Editor AssetProcessor
+
+
+```
+
+
+### 5. Launch Editor
 
-Run the Editor:
 
 ```
-build/linux/bin/profile/Editor
+$ cd $DEMO_BASE
+
+~/github$ cd o3de-demo-project
+
+~/github/o3de-demo-project$ cd build/linux/bin/profile
+
+~/github/o3de-demo-project/build/linux/bin/profile$ ./Editor
+
+
+
 ```

+ 10 - 0
Registry/bootstrap.setreg

@@ -0,0 +1,10 @@
+{
+    "Amazon": {
+        "AzCore": {
+            "Bootstrap": {
+		"project_path": ".."
+            }
+        }
+    }
+}
+

+ 11 - 0
Registry/physxdebugconfiguration.setreg

@@ -0,0 +1,11 @@
+{
+    "Amazon": {
+        "Gems": {
+            "PhysX": {
+                "Debug": {
+                    "PhysXDebugConfiguration": {}
+                }
+            }
+        }
+    }
+}

+ 9 - 0
Registry/physxdefaultsceneconfiguration.setreg

@@ -0,0 +1,9 @@
+{
+    "Amazon": {
+        "Gems": {
+            "PhysX": {
+                "DefaultSceneConfiguration": {}
+            }
+        }
+    }
+}

+ 105 - 0
Registry/physxsystemconfiguration.setreg

@@ -0,0 +1,105 @@
+{
+    "Amazon": {
+        "Gems": {
+            "PhysX": {
+                "PhysXSystemConfiguration": {
+                    "CollisionConfig": {
+                        "Layers": {
+                            "LayerNames": [
+                                "Default",
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {},
+                                {}
+                            ]
+                        },
+                        "Groups": {
+                            "GroupPresets": [
+                                {
+                                    "Name": "All",
+                                    "ReadOnly": true
+                                },
+                                {
+                                    "Id": {
+                                        "GroupId": "{B72454E5-5436-42F5-9BAE-6B9D2763E433}"
+                                    },
+                                    "Name": "None",
+                                    "Group": {
+                                        "Mask": 0
+                                    },
+                                    "ReadOnly": true
+                                }
+                            ]
+                        }
+                    },
+                    "MaterialLibrary": {
+                        "assetId": {
+                            "guid": "{7CDF49C3-91A2-5C4E-B642-6D1AEC80E70E}"
+                        },
+                        "loadBehavior": "QueueLoad",
+                        "assetHint": "assets/physics/surfacetypemateriallibrary.physmaterial"
+                    }
+                }
+            }
+        }
+    }
+}

+ 0 - 2
ShaderLib/scenesrg.srgi

@@ -1,4 +1,3 @@
-// {BEGIN_LICENSE}
 /*
  * Copyright (c) Contributors to the Open 3D Engine Project.
  * For complete copyright and license terms please see the LICENSE at the root of this distribution.
@@ -6,7 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-// {END_LICENSE}
 
 #pragma once
 

+ 0 - 2
ShaderLib/viewsrg.srgi

@@ -1,4 +1,3 @@
-// {BEGIN_LICENSE}
 /*
  * Copyright (c) Contributors to the Open 3D Engine Project.
  * For complete copyright and license terms please see the LICENSE at the root of this distribution.
@@ -6,7 +5,6 @@
  * SPDX-License-Identifier: Apache-2.0 OR MIT
  *
  */
-// {END_LICENSE}
 
 #pragma once
 

+ 2 - 2
cmake/EngineFinder.cmake

@@ -1,4 +1,4 @@
-# {BEGIN_LICENSE}
+#
 #
 # Copyright (c) Contributors to the Open 3D Engine Project.
 # For complete copyright and license terms please see the LICENSE at the root of this distribution.
@@ -6,7 +6,7 @@
 # SPDX-License-Identifier: Apache-2.0 OR MIT
 #
 #
-# {END_LICENSE}
+#
 # This file is copied during engine registration. Edits to this file will be lost next
 # time a registration happens.
 

+ 3 - 2
project.json

@@ -1,6 +1,6 @@
 {
     "project_name": "ROS2-Gem-Demo",
-    "project_id": "{13ee6f7a-c9d6-4919-b36b-ec4cd0a903cb}",
+    "project_id": "{9ed699a2-4b64-468e-ad9c-9cff6c0dfd3f}",
     "origin": "The primary repo for ROS2-Gem-Demo goes here: i.e. http://www.mydomain.com",
     "license": "What license ROS2-Gem-Demo uses goes here: i.e. https://opensource.org/licenses/Apache-2.0 Or https://opensource.org/licenses/MIT etc.",
     "display_name": "ROS2-Gem-Demo",
@@ -18,6 +18,7 @@
     ],
     "restricted": "ROS2-Gem-Demo",
     "gem_names": [
-        "ROS2"
+        "ROS2",
+        "ArchVis"
     ]
 }