Quellcode durchsuchen

Merge pull request #224 from RobotecAI/pb/warehouse_improvements

Warehouse Gem fixes and improvements
Adam Dąbrowski vor 2 Jahren
Ursprung
Commit
eff12dada4
44 geänderte Dateien mit 456 neuen und 361 gelöschten Zeilen
  1. 1 0
      .gitattributes
  2. 273 178
      Gems/WarehouseAssets/Assets/Prefabs/WarehouseScene.prefab
  3. 9 56
      Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Storage_on_wheels.prefab
  4. 3 1
      Gems/WarehouseAssets/Assets/Prefabs/Warehouse_structural/Components/Ceiling_Lamp.prefab
  5. 1 1
      Gems/WarehouseAssets/Assets/Prefabs/Warehouse_structural/Components/Wall_GI.prefab
  6. 2 26
      Gems/WarehouseAssets/Assets/Prefabs/Warehouse_structural/Warehouse_Roof.prefab
  7. 20 0
      Gems/WarehouseAssets/Assets/assets/Materials/storageonwheels.physxmaterial
  8. 1 0
      Gems/WarehouseAssets/Assets/assets/Warehouse/Floor_markings/markings_blue.material
  9. 1 0
      Gems/WarehouseAssets/Assets/assets/Warehouse/Floor_markings/markings_corner.material
  10. 1 0
      Gems/WarehouseAssets/Assets/assets/Warehouse/Floor_markings/markings_end1.material
  11. 1 0
      Gems/WarehouseAssets/Assets/assets/Warehouse/Floor_markings/markings_end2.material
  12. 1 0
      Gems/WarehouseAssets/Assets/assets/Warehouse/Floor_markings/markings_line.material
  13. 1 0
      Gems/WarehouseAssets/Assets/assets/Warehouse/Floor_markings/markings_mid1.material
  14. 1 0
      Gems/WarehouseAssets/Assets/assets/Warehouse/Floor_markings/markings_mid2.material
  15. 1 0
      Gems/WarehouseAssets/Assets/assets/Warehouse/Floor_markings/tire_traces1.material
  16. 1 0
      Gems/WarehouseAssets/Assets/assets/Warehouse/Floor_markings/tire_traces_circle.material
  17. 0 8
      Gems/WarehouseAssets/Assets/assets/markings_blue.material
  18. 0 3
      Gems/WarehouseAssets/Assets/assets/markings_blue.png
  19. 0 8
      Gems/WarehouseAssets/Assets/assets/markings_corner.material
  20. 0 3
      Gems/WarehouseAssets/Assets/assets/markings_corner.png
  21. 0 8
      Gems/WarehouseAssets/Assets/assets/markings_end1.material
  22. 0 3
      Gems/WarehouseAssets/Assets/assets/markings_end1.png
  23. 0 8
      Gems/WarehouseAssets/Assets/assets/markings_end2.material
  24. 0 3
      Gems/WarehouseAssets/Assets/assets/markings_end2.png
  25. 0 8
      Gems/WarehouseAssets/Assets/assets/markings_line.material
  26. 0 3
      Gems/WarehouseAssets/Assets/assets/markings_line.png
  27. 0 8
      Gems/WarehouseAssets/Assets/assets/markings_mid1.material
  28. 0 3
      Gems/WarehouseAssets/Assets/assets/markings_mid1.png
  29. 0 8
      Gems/WarehouseAssets/Assets/assets/markings_mid2.material
  30. 0 3
      Gems/WarehouseAssets/Assets/assets/markings_mid2.png
  31. 0 8
      Gems/WarehouseAssets/Assets/assets/tire_traces1.material
  32. 0 3
      Gems/WarehouseAssets/Assets/assets/tire_traces1.png
  33. 0 8
      Gems/WarehouseAssets/Assets/assets/tire_traces_circle.material
  34. 0 3
      Gems/WarehouseAssets/Assets/assets/tire_traces_circle.png
  35. 138 0
      Gems/WarehouseAssets/README.md
  36. BIN
      Gems/WarehouseAssets/docs/images/CameraSettings.png
  37. BIN
      Gems/WarehouseAssets/docs/images/Components.png
  38. BIN
      Gems/WarehouseAssets/docs/images/PrefabsFolder.png
  39. BIN
      Gems/WarehouseAssets/docs/images/RackProtection.png
  40. BIN
      Gems/WarehouseAssets/docs/images/StorageOnWheels.png
  41. BIN
      Gems/WarehouseAssets/docs/images/StorageRackPacks.png
  42. BIN
      Gems/WarehouseAssets/docs/images/StorageRacks.png
  43. BIN
      Gems/WarehouseAssets/docs/images/WarehouseGem.png
  44. BIN
      Gems/WarehouseAssets/docs/images/WarehouseScene.png

+ 1 - 0
.gitattributes

@@ -125,3 +125,4 @@ Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/Lucy_low.fbx filter=lf
 Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/marmoset_bake.tbscene filter=lfs diff=lfs merge=lfs -text
 Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/marmoset_bake.tbscene filter=lfs diff=lfs merge=lfs -text
 Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/Brass/brass_bake.spp filter=lfs diff=lfs merge=lfs -text
 Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/Brass/brass_bake.spp filter=lfs diff=lfs merge=lfs -text
 Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/stone/stone_bake.spp filter=lfs diff=lfs merge=lfs -text
 Gems/AtomLyIntegration/CommonFeatures/Assets/Objects/Lucy/.wip/stone/stone_bake.spp filter=lfs diff=lfs merge=lfs -text
+Gems/WarehouseAssets/docs/images/*.png filter= diff= merge= -text

Datei-Diff unterdrückt, da er zu groß ist
+ 273 - 178
Gems/WarehouseAssets/Assets/Prefabs/WarehouseScene.prefab


+ 9 - 56
Gems/WarehouseAssets/Assets/Prefabs/Warehouse_storage/Storage_on_wheels.prefab

@@ -84,7 +84,8 @@
                                         "MaterialAsset": {
                                         "MaterialAsset": {
                                             "assetId": {
                                             "assetId": {
                                                 "guid": "{B59DB34C-8CCC-5B6A-8F32-749689632151}"
                                                 "guid": "{B59DB34C-8CCC-5B6A-8F32-749689632151}"
-                                            }
+                                            },
+                                            "assetHint": "assets/warehouse/materials/mwarehousestorageonwheels.azmaterial"
                                         }
                                         }
                                     }
                                     }
                                 }
                                 }
@@ -185,10 +186,10 @@
                                     "Name": "Entire object",
                                     "Name": "Entire object",
                                     "MaterialAsset": {
                                     "MaterialAsset": {
                                         "assetId": {
                                         "assetId": {
-                                            "guid": "{A9587A71-FA52-5881-AF45-83A4C3D5660A}",
+                                            "guid": "{9E08AC7C-4AE8-5C65-AA41-2FCF93452D5A}",
                                             "subId": 1
                                             "subId": 1
                                         },
                                         },
-                                        "assetHint": "assets/warehouse/storageonwheels.physicsmaterial"
+                                        "assetHint": "assets/materials/storageonwheels.physicsmaterial"
                                     }
                                     }
                                 }
                                 }
                             ]
                             ]
@@ -215,55 +216,7 @@
                 },
                 },
                 "Component_[4588174646852359714]": {
                 "Component_[4588174646852359714]": {
                     "$type": "EditorDisabledCompositionComponent",
                     "$type": "EditorDisabledCompositionComponent",
-                    "Id": 4588174646852359714,
-                    "DisabledComponents": [
-                        {
-                            "$type": "EditorColliderComponent",
-                            "Id": 13201342092318588972,
-                            "ColliderConfiguration": {
-                                "MaterialSlots": {
-                                    "Slots": [
-                                        {
-                                            "Name": "MStorageOnWheels",
-                                            "MaterialAsset": {
-                                                "assetId": {
-                                                    "guid": "{A9587A71-FA52-5881-AF45-83A4C3D5660A}",
-                                                    "subId": 1
-                                                },
-                                                "assetHint": "assets/warehouse/storageonwheels.physicsmaterial"
-                                            }
-                                        }
-                                    ]
-                                }
-                            },
-                            "ShapeConfiguration": {
-                                "PhysicsAsset": {
-                                    "Asset": {
-                                        "assetId": {
-                                            "guid": "{06D57D9C-F2B1-52CD-AB7B-21EF570C380A}",
-                                            "subId": 1274233299
-                                        },
-                                        "assetHint": "assets/warehouse/warehouse_storageonwheels.pxmesh"
-                                    },
-                                    "Configuration": {
-                                        "PhysicsAsset": {
-                                            "assetId": {
-                                                "guid": "{06D57D9C-F2B1-52CD-AB7B-21EF570C380A}",
-                                                "subId": 1274233299
-                                            },
-                                            "loadBehavior": "QueueLoad",
-                                            "assetHint": "assets/warehouse/warehouse_storageonwheels.pxmesh"
-                                        },
-                                        "AssetScale": [
-                                            1.0,
-                                            1.0,
-                                            1.0449999570846558
-                                        ]
-                                    }
-                                }
-                            }
-                        }
-                    ]
+                    "Id": 4588174646852359714
                 },
                 },
                 "Component_[5143803638157116517]": {
                 "Component_[5143803638157116517]": {
                     "$type": "EditorColliderComponent",
                     "$type": "EditorColliderComponent",
@@ -280,10 +233,10 @@
                                     "Name": "Entire object",
                                     "Name": "Entire object",
                                     "MaterialAsset": {
                                     "MaterialAsset": {
                                         "assetId": {
                                         "assetId": {
-                                            "guid": "{A9587A71-FA52-5881-AF45-83A4C3D5660A}",
+                                            "guid": "{9E08AC7C-4AE8-5C65-AA41-2FCF93452D5A}",
                                             "subId": 1
                                             "subId": 1
                                         },
                                         },
-                                        "assetHint": "assets/warehouse/storageonwheels.physicsmaterial"
+                                        "assetHint": "assets/materials/storageonwheels.physicsmaterial"
                                     }
                                     }
                                 }
                                 }
                             ]
                             ]
@@ -342,10 +295,10 @@
                                     "Name": "Entire object",
                                     "Name": "Entire object",
                                     "MaterialAsset": {
                                     "MaterialAsset": {
                                         "assetId": {
                                         "assetId": {
-                                            "guid": "{A9587A71-FA52-5881-AF45-83A4C3D5660A}",
+                                            "guid": "{9E08AC7C-4AE8-5C65-AA41-2FCF93452D5A}",
                                             "subId": 1
                                             "subId": 1
                                         },
                                         },
-                                        "assetHint": "assets/warehouse/storageonwheels.physicsmaterial"
+                                        "assetHint": "assets/materials/storageonwheels.physicsmaterial"
                                     }
                                     }
                                 }
                                 }
                             ]
                             ]

+ 3 - 1
Gems/WarehouseAssets/Assets/Prefabs/Warehouse_structural/Components/Ceiling_Lamp.prefab

@@ -263,7 +263,7 @@
                     "Controller": {
                     "Controller": {
                         "Configuration": {
                         "Configuration": {
                             "LightType": 1,
                             "LightType": 1,
-                            "Intensity": 1800.0,
+                            "Intensity": 2200.0,
                             "AttenuationRadiusMode": 0,
                             "AttenuationRadiusMode": 0,
                             "AttenuationRadius": 40.0,
                             "AttenuationRadius": 40.0,
                             "Enable Shadow": true,
                             "Enable Shadow": true,
@@ -272,6 +272,8 @@
                             "Shadow Filter Method": 1,
                             "Shadow Filter Method": 1,
                             "Filtering Sample Count": 64,
                             "Filtering Sample Count": 64,
                             "Esm Exponent": 5000.0,
                             "Esm Exponent": 5000.0,
+                            "Shadow Caching Mode": 1,
+                            "Shadow Caching Enabled": true,
                             "Affects GI Factor": 0.5
                             "Affects GI Factor": 0.5
                         }
                         }
                     }
                     }

+ 1 - 1
Gems/WarehouseAssets/Assets/Prefabs/Warehouse_structural/Components/Wall_GI.prefab

@@ -68,7 +68,7 @@
                     "Controller": {
                     "Controller": {
                         "Configuration": {
                         "Configuration": {
                             "LightType": 4,
                             "LightType": 4,
-                            "Intensity": 20.0,
+                            "Intensity": 30.0,
                             "AttenuationRadiusMode": 0,
                             "AttenuationRadiusMode": 0,
                             "AttenuationRadius": 8.0,
                             "AttenuationRadius": 8.0,
                             "Affects GI Factor": 2.0
                             "Affects GI Factor": 2.0

+ 2 - 26
Gems/WarehouseAssets/Assets/Prefabs/Warehouse_structural/Warehouse_Roof.prefab

@@ -698,39 +698,15 @@
                                 22.0,
                                 22.0,
                                 12.0
                                 12.0
                             ],
                             ],
-                            "AmbientMultiplier": 0.20000000298023224,
+                            "AmbientMultiplier": 0.10000000149011612,
                             "ViewBias": 0.6299999952316284,
                             "ViewBias": 0.6299999952316284,
                             "NormalBias": 0.09000000357627869,
                             "NormalBias": 0.09000000357627869,
                             "NumRaysPerProbe": 6,
                             "NumRaysPerProbe": 6,
                             "FrameUpdateCount": 10,
                             "FrameUpdateCount": 10,
-                            "BakedIrradianceTextureRelativePath": "DiffuseProbeGrids/Diffuse_Probe_Grid_1EBFD2D8-93F3-4449-878A-C0291BA3C7E3_Irradiance_lutrgba16f.dds",
-                            "BakedDistanceTextureRelativePath": "DiffuseProbeGrids/Diffuse_Probe_Grid_3F63628F-3208-41F5-BD34-677A496381EE_Distance_lutrg32f.dds",
-                            "BakedProbeDataTextureRelativePath": "DiffuseProbeGrids/Diffuse_Probe_Grid_47352905-8103-47CF-9818-F19ED3597305_ProbeData_lutrgba16f.dds",
-                            "BakedIrradianceTextureAsset": {
-                                "assetId": {
-                                    "guid": "{156706A8-F151-5CBF-820A-4B56BB3C016D}",
-                                    "subId": 1000
-                                },
-                                "assetHint": "diffuseprobegrids/diffuse_probe_grid_1ebfd2d8-93f3-4449-878a-c0291ba3c7e3_irradiance_lutrgba16f.dds.streamingimage"
-                            },
-                            "BakedDistanceTextureAsset": {
-                                "assetId": {
-                                    "guid": "{006C1604-C8DA-5923-9C96-F082168388E4}",
-                                    "subId": 1000
-                                },
-                                "assetHint": "diffuseprobegrids/diffuse_probe_grid_3f63628f-3208-41f5-bd34-677a496381ee_distance_lutrg32f.dds.streamingimage"
-                            },
-                            "BakedProbeDataTextureAsset": {
-                                "assetId": {
-                                    "guid": "{3207C145-424A-5111-820A-A09B4D319DDB}",
-                                    "subId": 1000
-                                },
-                                "assetHint": "diffuseprobegrids/diffuse_probe_grid_47352905-8103-47cf-9818-f19ed3597305_probedata_lutrgba16f.dds.streamingimage"
-                            },
                             "VisualizationShowInactiveProbes": true
                             "VisualizationShowInactiveProbes": true
                         }
                         }
                     },
                     },
-                    "ambientMultiplier": 0.20000000298023224,
+                    "ambientMultiplier": 0.10000000149011612,
                     "viewBias": 0.6299999952316284,
                     "viewBias": 0.6299999952316284,
                     "normalBias": 0.09000000357627869,
                     "normalBias": 0.09000000357627869,
                     "numRaysPerProbe": 6,
                     "numRaysPerProbe": 6,

+ 20 - 0
Gems/WarehouseAssets/Assets/assets/Materials/storageonwheels.physxmaterial

@@ -0,0 +1,20 @@
+<ObjectStream version="3">
+	<Class name="PhysX::EditorMaterialAsset" version="3" type="{BC7B88B9-EE31-4FBF-A01E-2A93624C49D3}">
+		<Class name="AssetData" field="BaseClass1" version="1" type="{AF3F7D32-1536-422A-89F3-A11E1F5B5A9C}"/>
+		<Class name="PhysX::MaterialConfiguration" field="MaterialConfiguration" version="1" type="{66213D20-9862-465D-AF4F-2D94317161F6}">
+			<Class name="float" field="DynamicFriction" value="0.2000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+			<Class name="float" field="StaticFriction" value="0.2000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+			<Class name="float" field="Restitution" value="0.1000000" 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="120.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+			<Class name="PhysX::CompliantContactModeConfiguration" field="CompliantContactMode" version="1" type="{1F38A087-E918-4ED1-AEC5-5FEC25A47AD1}">
+				<Class name="bool" field="Enabled" value="false" type="{A0CA880C-AFE4-43CB-926C-59AC48496112}"/>
+				<Class name="float" field="Damping" value="1.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+				<Class name="float" field="Stiffness" value="100000.0000000" type="{EA2C3E90-AFBE-44D4-A90D-FAAF79BAF93D}"/>
+			</Class>
+			<Class name="Color" field="DebugColor" value="0.8231327 0.8231327 0.8231327 1.0000000" type="{7894072A-9050-4F0F-901B-34B1A0D29417}"/>
+		</Class>
+	</Class>
+</ObjectStream>
+

+ 1 - 0
Gems/WarehouseAssets/Assets/assets/Warehouse/Floor_markings/markings_blue.material

@@ -3,6 +3,7 @@
     "materialTypeVersion": 5,
     "materialTypeVersion": 5,
     "propertyValues": {
     "propertyValues": {
         "baseColor.textureMap": "markings_blue.png",
         "baseColor.textureMap": "markings_blue.png",
+        "normal.useTexture": false,
         "opacity.mode": "Cutout"
         "opacity.mode": "Cutout"
     }
     }
 }
 }

+ 1 - 0
Gems/WarehouseAssets/Assets/assets/Warehouse/Floor_markings/markings_corner.material

@@ -3,6 +3,7 @@
     "materialTypeVersion": 5,
     "materialTypeVersion": 5,
     "propertyValues": {
     "propertyValues": {
         "baseColor.textureMap": "markings_corner.png",
         "baseColor.textureMap": "markings_corner.png",
+        "normal.useTexture": false,
         "opacity.mode": "Cutout"
         "opacity.mode": "Cutout"
     }
     }
 }
 }

+ 1 - 0
Gems/WarehouseAssets/Assets/assets/Warehouse/Floor_markings/markings_end1.material

@@ -3,6 +3,7 @@
     "materialTypeVersion": 5,
     "materialTypeVersion": 5,
     "propertyValues": {
     "propertyValues": {
         "baseColor.textureMap": "markings_end1.png",
         "baseColor.textureMap": "markings_end1.png",
+        "normal.useTexture": false,
         "opacity.mode": "Cutout"
         "opacity.mode": "Cutout"
     }
     }
 }
 }

+ 1 - 0
Gems/WarehouseAssets/Assets/assets/Warehouse/Floor_markings/markings_end2.material

@@ -3,6 +3,7 @@
     "materialTypeVersion": 5,
     "materialTypeVersion": 5,
     "propertyValues": {
     "propertyValues": {
         "baseColor.textureMap": "markings_end2.png",
         "baseColor.textureMap": "markings_end2.png",
+        "normal.useTexture": false,
         "opacity.mode": "Cutout"
         "opacity.mode": "Cutout"
     }
     }
 }
 }

+ 1 - 0
Gems/WarehouseAssets/Assets/assets/Warehouse/Floor_markings/markings_line.material

@@ -3,6 +3,7 @@
     "materialTypeVersion": 5,
     "materialTypeVersion": 5,
     "propertyValues": {
     "propertyValues": {
         "baseColor.textureMap": "markings_line.png",
         "baseColor.textureMap": "markings_line.png",
+        "normal.useTexture": false,
         "opacity.mode": "Cutout"
         "opacity.mode": "Cutout"
     }
     }
 }
 }

+ 1 - 0
Gems/WarehouseAssets/Assets/assets/Warehouse/Floor_markings/markings_mid1.material

@@ -3,6 +3,7 @@
     "materialTypeVersion": 5,
     "materialTypeVersion": 5,
     "propertyValues": {
     "propertyValues": {
         "baseColor.textureMap": "markings_mid1.png",
         "baseColor.textureMap": "markings_mid1.png",
+        "normal.useTexture": false,
         "opacity.mode": "Cutout"
         "opacity.mode": "Cutout"
     }
     }
 }
 }

+ 1 - 0
Gems/WarehouseAssets/Assets/assets/Warehouse/Floor_markings/markings_mid2.material

@@ -3,6 +3,7 @@
     "materialTypeVersion": 5,
     "materialTypeVersion": 5,
     "propertyValues": {
     "propertyValues": {
         "baseColor.textureMap": "markings_mid2.png",
         "baseColor.textureMap": "markings_mid2.png",
+        "normal.useTexture": false,
         "opacity.mode": "Cutout"
         "opacity.mode": "Cutout"
     }
     }
 }
 }

+ 1 - 0
Gems/WarehouseAssets/Assets/assets/Warehouse/Floor_markings/tire_traces1.material

@@ -3,6 +3,7 @@
     "materialTypeVersion": 5,
     "materialTypeVersion": 5,
     "propertyValues": {
     "propertyValues": {
         "baseColor.textureMap": "tire_traces1.png",
         "baseColor.textureMap": "tire_traces1.png",
+        "normal.useTexture": false,
         "opacity.mode": "Cutout"
         "opacity.mode": "Cutout"
     }
     }
 }
 }

+ 1 - 0
Gems/WarehouseAssets/Assets/assets/Warehouse/Floor_markings/tire_traces_circle.material

@@ -3,6 +3,7 @@
     "materialTypeVersion": 5,
     "materialTypeVersion": 5,
     "propertyValues": {
     "propertyValues": {
         "baseColor.textureMap": "tire_traces_circle.png",
         "baseColor.textureMap": "tire_traces_circle.png",
+        "normal.useTexture": false,
         "opacity.mode": "Cutout"
         "opacity.mode": "Cutout"
     }
     }
 }
 }

+ 0 - 8
Gems/WarehouseAssets/Assets/assets/markings_blue.material

@@ -1,8 +0,0 @@
-{
-    "materialType": "@gemroot:Atom_Feature_Common@/Assets/Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 5,
-    "propertyValues": {
-        "baseColor.textureMap": "markings_blue.png",
-        "opacity.mode": "Cutout"
-    }
-}

+ 0 - 3
Gems/WarehouseAssets/Assets/assets/markings_blue.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:15cd7962db8d989a6ad1369b0710d5c7ed84438582dbb7a4a2646427d0a98d7d
-size 475073

+ 0 - 8
Gems/WarehouseAssets/Assets/assets/markings_corner.material

@@ -1,8 +0,0 @@
-{
-    "materialType": "@gemroot:Atom_Feature_Common@/Assets/Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 5,
-    "propertyValues": {
-        "baseColor.textureMap": "markings_corner.png",
-        "opacity.mode": "Cutout"
-    }
-}

+ 0 - 3
Gems/WarehouseAssets/Assets/assets/markings_corner.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:37fbd6026efa9302929844b1d5dbfa9f0f344e69ad1c672a0414a36e70636361
-size 370202

+ 0 - 8
Gems/WarehouseAssets/Assets/assets/markings_end1.material

@@ -1,8 +0,0 @@
-{
-    "materialType": "@gemroot:Atom_Feature_Common@/Assets/Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 5,
-    "propertyValues": {
-        "baseColor.textureMap": "markings_end1.png",
-        "opacity.mode": "Cutout"
-    }
-}

+ 0 - 3
Gems/WarehouseAssets/Assets/assets/markings_end1.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7d39ebfe2e7b87362dfc031db18bb48067eea4a672df8f148baf4a9170abbab7
-size 667266

+ 0 - 8
Gems/WarehouseAssets/Assets/assets/markings_end2.material

@@ -1,8 +0,0 @@
-{
-    "materialType": "@gemroot:Atom_Feature_Common@/Assets/Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 5,
-    "propertyValues": {
-        "baseColor.textureMap": "markings_end2.png",
-        "opacity.mode": "Cutout"
-    }
-}

+ 0 - 3
Gems/WarehouseAssets/Assets/assets/markings_end2.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b2319f0c2e7388de9a52904c9f38d341266f109935fc3a04cdabc73ba55fb710
-size 660848

+ 0 - 8
Gems/WarehouseAssets/Assets/assets/markings_line.material

@@ -1,8 +0,0 @@
-{
-    "materialType": "@gemroot:Atom_Feature_Common@/Assets/Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 5,
-    "propertyValues": {
-        "baseColor.textureMap": "markings_line.png",
-        "opacity.mode": "Cutout"
-    }
-}

+ 0 - 3
Gems/WarehouseAssets/Assets/assets/markings_line.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:563598886a2541d37846cd2bde1937c7610d59fa267c96de78ad46ae4f3f0409
-size 310024

+ 0 - 8
Gems/WarehouseAssets/Assets/assets/markings_mid1.material

@@ -1,8 +0,0 @@
-{
-    "materialType": "@gemroot:Atom_Feature_Common@/Assets/Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 5,
-    "propertyValues": {
-        "baseColor.textureMap": "markings_mid1.png",
-        "opacity.mode": "Cutout"
-    }
-}

+ 0 - 3
Gems/WarehouseAssets/Assets/assets/markings_mid1.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:94d269b0e0fc5b3c07eac8098dde34239c76ef8cbab4e2640402510a3b46c21a
-size 518989

+ 0 - 8
Gems/WarehouseAssets/Assets/assets/markings_mid2.material

@@ -1,8 +0,0 @@
-{
-    "materialType": "@gemroot:Atom_Feature_Common@/Assets/Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 5,
-    "propertyValues": {
-        "baseColor.textureMap": "markings_mid2.png",
-        "opacity.mode": "Cutout"
-    }
-}

+ 0 - 3
Gems/WarehouseAssets/Assets/assets/markings_mid2.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:35f36b877e056458b3de825a245e52b19b7c514bae97e5e6e59ea34197ddef2d
-size 519249

+ 0 - 8
Gems/WarehouseAssets/Assets/assets/tire_traces1.material

@@ -1,8 +0,0 @@
-{
-    "materialType": "@gemroot:Atom_Feature_Common@/Assets/Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 5,
-    "propertyValues": {
-        "baseColor.textureMap": "tire_traces1.png",
-        "opacity.mode": "Cutout"
-    }
-}

+ 0 - 3
Gems/WarehouseAssets/Assets/assets/tire_traces1.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:cd48fd10643f8aada09aea7f28fd1a0655f1bedbedadc1e7d277de18ea76275e
-size 111737

+ 0 - 8
Gems/WarehouseAssets/Assets/assets/tire_traces_circle.material

@@ -1,8 +0,0 @@
-{
-    "materialType": "@gemroot:Atom_Feature_Common@/Assets/Materials/Types/StandardPBR.materialtype",
-    "materialTypeVersion": 5,
-    "propertyValues": {
-        "baseColor.textureMap": "tire_traces_circle.png",
-        "opacity.mode": "Cutout"
-    }
-}

+ 0 - 3
Gems/WarehouseAssets/Assets/assets/tire_traces_circle.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:69db884c69ed09902d03738a8fc8b7ac1da8a2e86f5336e8b546df7d4ffadb03
-size 5400

+ 138 - 0
Gems/WarehouseAssets/README.md

@@ -0,0 +1,138 @@
+## Warehouse Assets Gem
+
+![](docs/images/WarehouseGem.png)
+
+### General description
+
+This gem contains a set of models and prefabs which can be used to create a warehouse project suitable for robotic simulations.
+
+### Contents
+
+All of the contents of this gem reside in the folder `Assets`. It comprises 2 sub-folders:
+
+- `assets` containing models, textures, and material definitions
+- `Prefabs` containing prefabs that can be used to build the scene
+
+The `Prefabs` folder has the following structure:
+
+![](docs/images/PrefabsFolder.png)
+
+All the prefabs have appropriate physics parameters including collision shapes.
+
+#### Basic Components
+
+![](docs/images/Components.png)
+
+A set of basic items to be used in the warehouse is located in the `Components` folder. The prefabs (in the image, left to right): 
+
+- `WarehouseRack.prefab` 
+- `WarehouseBox1.prefab` 
+- `WarehouseBox2.prefab`
+- `WarehouseBox3.prefab`
+- `WarehouseBox4.prefab`
+
+#### Storage Racks
+
+![](docs/images/StorageRacks.png)
+
+Storage racks are created from basic components, combined in 5 different permutations. The prefabs (in the image, left to right): 
+
+- `Storage_rack1.prefab`
+- `Storage_rack2.prefab`
+- `Storage_rack3.prefab`
+- `Storage_rack4.prefab`
+- `Storage_rack5.prefab`
+
+#### Storage Rack Packs
+
+![](docs/images/StorageRackPacks.png)
+
+The rack packs were created by stacking 4 storage rack prefabs in different combinations. These prefabs may simplify creating larger warehouses. The prefabs (in the image, left to right): 
+
+- `Storage_2x2_Pack1.prefab`
+- `Storage_2x2_Pack2.prefab`
+- `Storage_2x2_Pack3.prefab`
+
+#### Storage on Wheels
+
+![](docs/images/StorageOnWheels.png)
+
+`Storage_on_wheels.prefab` is a storage cage on wheels. As opposed to other prefabs it can be moved around the scene. The collision shape was designed in a way, that allows the Proteus robot to ride below it.
+
+#### Rack protection
+
+![](docs/images/RackProtection.png)
+
+There are 2 elements, located in the `Rack_protectors` folder, that can be placed next to the racks. These are (in the image, left to right):
+
+- `Rack_front_protection.prefab`
+- `Rack_side_protection.prefab`
+
+#### Misc
+
+The `Misc` folder contains prefabs with floor lines.
+
+#### Warehouse structural
+
+The `Warehouse_structural` folder contains prefabs comprising the warehouse building. These are:
+
+- `Warehouse_Floor.prefab`
+- `Warehouse_Walls.prefab`
+- `Warehouse_Roof.prefab`
+
+The folder contains also a `Components` subfolder, containing assets used in these 3 prefabs.
+
+#### Warehouse scene
+
+![](docs/images/WarehouseScene.png)
+
+The `WarehouseScene.prefab` contains a sample, ready-to-use warehouse scene, built from prefabs listed in this document.
+
+### Tips on using Warehouse Assets Gem
+
+#### Creating Warehouse scene
+
+***Tip 1***
+
+To achieve alignment, all 3 "structural" prefabs (floor, walls and roof) should be instantiated in the same coordinates.
+
+***Tip 2***
+
+Each of the frontal walls in the `Warehouse_Walls.prefab` contains optional gate openings and gates. It consists of 3 entities:
+
+- `Front_no_gates` - solid wall without opening
+- `Front_gate` - wall with gate opening
+- `Gate` - gate matching the opening
+
+Each of them can be activated or deactivated by enabling or disabling `PhysX Collider` and `Mesh` components. It is possible to obtain one of the following variants:
+
+1. Solid wall - enable `Front_no_gates`, disable the other 2
+2. Open gate - enable `Front_gate`, disable the other 2
+3. closed gate - enable `Front_gate` and `Gate`, disable `Front_no_gates`
+
+***Tip 3***
+
+Warehouses with open gates may be connected by placing them one after another.
+
+#### Visual quality
+
+***Tip 4***
+
+For best visual results when using the `WarehouseScene.prefab` it is advised to apply the following effects to the camera entity:
+
+- Bloom
+- SSAO
+- Deferred Fog
+
+A sample set of parameters can be seen in this image:
+
+![](docs/images/CameraSettings.png)
+
+***Tip 5***
+
+The `WarehouseScene.prefab` is equipped with 2 Reflection Probes, which can be found in: `Warehouse/Global_illumination/Reflection_Probe`. To work correctly, Reflection Probes require baked materials, thus are disabled by default. For a better visual experience, it is advised to enable them. To do so follow these steps:
+
+1. Open the `WarehouseScene.prefab`
+2. Navigate to `Warehouse/Global_illumination` and locate 2 `Reflection_Probe` entities.
+3. Select each of them, enable the `Reflection Probe` component, and click `Bake Reflection Probe`
+

BIN
Gems/WarehouseAssets/docs/images/CameraSettings.png


BIN
Gems/WarehouseAssets/docs/images/Components.png


BIN
Gems/WarehouseAssets/docs/images/PrefabsFolder.png


BIN
Gems/WarehouseAssets/docs/images/RackProtection.png


BIN
Gems/WarehouseAssets/docs/images/StorageOnWheels.png


BIN
Gems/WarehouseAssets/docs/images/StorageRackPacks.png


BIN
Gems/WarehouseAssets/docs/images/StorageRacks.png


BIN
Gems/WarehouseAssets/docs/images/WarehouseGem.png


BIN
Gems/WarehouseAssets/docs/images/WarehouseScene.png


Einige Dateien werden nicht angezeigt, da zu viele Dateien in diesem Diff geändert wurden.