Skip to content

Commit 65ce3dc

Browse files
AMZN-alexpeteAMZN-alexpete
authored
Merge pull request o3de#570 from RobotecAI/mp/merge_stabilization4
Merge next changes from development to stabilization2310
2 parents 05aa2dc + f1e7ff0 commit 65ce3dc

File tree

72 files changed

+2270
-664
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+2270
-664
lines changed

‎Gems/ROS2/Assets/Gazebo/Black.material‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"materialType": "Materials/Types/StandardPBR.materialtype",
3+
"materialTypeVersion": 5,
4+
"propertyValues": {
5+
"metallic.useTexture": false,
6+
"normal.useTexture": false,
7+
"roughness.useTexture": false,
8+
"specularF0.enableMultiScatterCompensation": true,
9+
"specularF0.useTexture": false,
10+
"baseColor.useTexture": false,
11+
"roughness.factor": 0.9,
12+
"metallic.factor": 0.0,
13+
"baseColor.color": [
14+
0.0,
15+
0.0,
16+
0.0,
17+
1.0
18+
]
19+
}
20+
}

‎Gems/ROS2/Assets/Gazebo/BlackTransparent.material‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"materialType": "Materials/Types/StandardPBR.materialtype",
3+
"materialTypeVersion": 5,
4+
"propertyValues": {
5+
"metallic.useTexture": false,
6+
"normal.useTexture": false,
7+
"roughness.useTexture": false,
8+
"specularF0.enableMultiScatterCompensation": true,
9+
"specularF0.useTexture": false,
10+
"baseColor.useTexture": false,
11+
"roughness.factor": 0.9,
12+
"metallic.factor": 0.0,
13+
"baseColor.color": [
14+
0.0,
15+
0.0,
16+
0.0,
17+
1.0
18+
],
19+
"opacity.mode": "Blended",
20+
"opacity.alphaSource": "None",
21+
"opacity.factor": 0.5
22+
}
23+
}

‎Gems/ROS2/Assets/Gazebo/Blue.material‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"materialType": "Materials/Types/StandardPBR.materialtype",
3+
"materialTypeVersion": 5,
4+
"propertyValues": {
5+
"metallic.useTexture": false,
6+
"normal.useTexture": false,
7+
"roughness.useTexture": false,
8+
"specularF0.enableMultiScatterCompensation": true,
9+
"specularF0.useTexture": false,
10+
"baseColor.useTexture": false,
11+
"roughness.factor": 0.9,
12+
"metallic.factor": 0.0,
13+
"baseColor.color": [
14+
0.0,
15+
0.0,
16+
1.0,
17+
1.0
18+
]
19+
}
20+
}

‎Gems/ROS2/Assets/Gazebo/BlueGlow.material‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{
2+
"materialType": "Materials/Types/StandardPBR.materialtype",
3+
"materialTypeVersion": 5,
4+
"propertyValues": {
5+
"metallic.useTexture": false,
6+
"normal.useTexture": false,
7+
"roughness.useTexture": false,
8+
"specularF0.enableMultiScatterCompensation": true,
9+
"specularF0.useTexture": false,
10+
"baseColor.useTexture": false,
11+
"roughness.factor": 0.9,
12+
"metallic.factor": 0.0,
13+
"baseColor.color": [
14+
0.0,
15+
0.0,
16+
1.0,
17+
1.0
18+
],
19+
"emissive.enable": true,
20+
"emissive.color": [
21+
0.0,
22+
0.0,
23+
1.0,
24+
1.0
25+
],
26+
"emissive.intensity": 5.5
27+
}
28+
}

‎Gems/ROS2/Assets/Gazebo/BlueLaser.material‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"materialType": "Materials/Types/StandardPBR.materialtype",
3+
"materialTypeVersion": 5,
4+
"propertyValues": {
5+
"metallic.useTexture": false,
6+
"normal.useTexture": false,
7+
"roughness.useTexture": false,
8+
"specularF0.enableMultiScatterCompensation": true,
9+
"specularF0.useTexture": false,
10+
"baseColor.useTexture": false,
11+
"roughness.factor": 0.9,
12+
"metallic.factor": 0.0,
13+
"baseColor.color": [
14+
0.0,
15+
0.0,
16+
1.0,
17+
1.0
18+
],
19+
"opacity.mode": "Blended",
20+
"opacity.alphaSource": "None",
21+
"opacity.factor": 0.6
22+
}
23+
}

‎Gems/ROS2/Assets/Gazebo/BlueTransparent.material‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
{
2+
"materialType": "Materials/Types/StandardPBR.materialtype",
3+
"materialTypeVersion": 5,
4+
"propertyValues": {
5+
"metallic.useTexture": false,
6+
"normal.useTexture": false,
7+
"roughness.useTexture": false,
8+
"specularF0.enableMultiScatterCompensation": true,
9+
"specularF0.useTexture": false,
10+
"baseColor.useTexture": false,
11+
"roughness.factor": 0.9,
12+
"metallic.factor": 0.0,
13+
"baseColor.color": [
14+
0.0,
15+
0.0,
16+
1.0,
17+
1.0
18+
],
19+
"opacity.mode": "Blended",
20+
"opacity.alphaSource": "None",
21+
"opacity.factor": 0.5
22+
}
23+
}

‎Gems/ROS2/Assets/Gazebo/Bricks.material‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"materialType": "Materials/Types/StandardPBR.materialtype",
3+
"materialTypeVersion": 5,
4+
"propertyValues": {
5+
"metallic.useTexture": false,
6+
"normal.useTexture": false,
7+
"roughness.useTexture": false,
8+
"specularF0.enableMultiScatterCompensation": true,
9+
"specularF0.useTexture": false,
10+
"baseColor.useTexture": false,
11+
"roughness.factor": 1.0,
12+
"metallic.factor": 0.0,
13+
"baseColor.color": [
14+
0.6627,
15+
0.302,
16+
0.1568,
17+
1.0
18+
]
19+
}
20+
}

‎Gems/ROS2/Assets/Gazebo/CeilingTiled.material‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"materialType": "Materials/Types/StandardPBR.materialtype",
3+
"materialTypeVersion": 5,
4+
"propertyValues": {
5+
"metallic.useTexture": false,
6+
"normal.useTexture": false,
7+
"roughness.useTexture": false,
8+
"specularF0.enableMultiScatterCompensation": true,
9+
"specularF0.useTexture": false,
10+
"baseColor.useTexture": false,
11+
"roughness.factor": 0.9,
12+
"metallic.factor": 0.0,
13+
"baseColor.color": [
14+
0.921,
15+
0.921,
16+
0.921,
17+
1.0
18+
]
19+
}
20+
}

‎Gems/ROS2/Assets/Gazebo/CloudySky.material‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"materialType": "Materials/Types/StandardPBR.materialtype",
3+
"materialTypeVersion": 5,
4+
"propertyValues": {
5+
"metallic.useTexture": false,
6+
"normal.useTexture": false,
7+
"roughness.useTexture": false,
8+
"specularF0.enableMultiScatterCompensation": true,
9+
"specularF0.useTexture": false,
10+
"baseColor.useTexture": false,
11+
"roughness.factor": 0.1,
12+
"metallic.factor": 0.6,
13+
"baseColor.color": [
14+
0.0,
15+
0.0,
16+
1.0,
17+
1.0
18+
]
19+
}
20+
}

‎Gems/ROS2/Assets/Gazebo/DarkGray.material‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
{
2+
"materialType": "Materials/Types/StandardPBR.materialtype",
3+
"materialTypeVersion": 5,
4+
"propertyValues": {
5+
"metallic.useTexture": false,
6+
"normal.useTexture": false,
7+
"roughness.useTexture": false,
8+
"specularF0.enableMultiScatterCompensation": true,
9+
"specularF0.useTexture": false,
10+
"baseColor.useTexture": false,
11+
"roughness.factor": 0.825,
12+
"metallic.factor": 0.0,
13+
"baseColor.color": [
14+
0.175,
15+
0.175,
16+
0.175,
17+
1.0
18+
]
19+
}
20+
}

0 commit comments

Comments
 (0)