Integrating github/staging through commit ab87ed9

2021-04-09 11:27:37 -07:00
parent ae62a97894
commit 1044dc3da1
1582 changed files with 29374 additions and 519051 deletions
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:055c672e895ec64f850f33f424da0b9a451e5b95e0e57fa39974e1c027c02246
+size 437729
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:41aafc78cb4437b8fd3444d9bef9ba39cd506a883d16079d1b51abe20df5b361
+size 1087961
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:d05cf631590adb3890bd4940ed1c7fb6f482cd4fafa63ae20103230bf7614226
+size 1154699
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0da5b5c55a737a902e6330c8897af38a088de018af3da9b4de11be5680c1bc0d
+size 513767
@@ -0,0 +1,4 @@
+{
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "parentMaterial": "Materials/Presets/PBR/default_grid.material"
+}
@@ -0,0 +1,11 @@
+{
+    "description": "",
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "parentMaterial": "Materials/Presets/PBR/default_grid.material",
+    "propertyLayoutVersion": 3,
+    "properties": {
+        "opacity": {
+            "mode": "Blended"
+        }
+    }
+}
@@ -0,0 +1,54 @@
+
+/*
+* All or portions of this file Copyright (c) Amazon.com, Inc. or its affiliates or
+* its licensors.
+*
+* For complete copyright and license terms please see the LICENSE at the root of this
+* distribution (the "License"). All use of this software is governed by the License,
+* or, if provided, by the license below or the license accompanying this file. Do not
+* remove or modify any license notices. This file is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*
+*/
+
+#include <viewsrg.srgi>
+#include <Atom/RPI/ShaderResourceGroups/DefaultObjectSrg.azsli>
+#include <Atom/RPI/ShaderResourceGroups/DefaultDrawSrg.azsli>
+#include <Atom/Features/PBR/ForwardPassSrg.azsli>
+
+struct VertexInput
+{
+    float3 m_position : POSITION;
+    float2 m_uv : UV0;
+};
+
+struct VertexOutput
+{
+    float4 m_position : SV_Position;
+    float2 m_uv : UV0;
+};
+
+VertexOutput MainVS(VertexInput input)
+{
+    VertexOutput output;
+    float3 worldPosition = mul(ObjectSrg::GetWorldMatrix(), float4(input.m_position, 1)).xyz;
+    output.m_position = mul(ViewSrg::m_viewProjectionMatrix, float4(worldPosition, 1.0));
+
+    output.m_uv = input.m_uv;
+        
+    return output;
+}
+
+struct PixelOutput
+{
+    float4 m_color : SV_Target0;
+};
+
+PixelOutput MainPS(VertexOutput input)
+{
+    PixelOutput output;
+
+    output.m_color = float4(input.m_uv, 0, 1);
+
+    return output;
+}
@@ -0,0 +1,3 @@
+{
+    "materialType": "UVs.materialtype"
+}
@@ -0,0 +1,7 @@
+{
+    "shaders": [
+        {
+            "file": "UVs.shader"
+        }
+    ]
+}
@@ -0,0 +1,25 @@
+{
+    "Source" : "UVs.azsl",
+
+    "DepthStencilState" : { 
+        "Depth" : { "Enable" : true, "CompareFunc" : "GreaterEqual" }
+    },
+    
+    // Using auxgeom draw list to avoid tonemapping
+    "DrawList": "auxgeom",
+
+    "ProgramSettings":
+    {
+      "EntryPoints":
+      [
+        {
+          "name": "MainVS",
+          "type": "Vertex"
+        },
+        {
+          "name": "MainPS",
+          "type": "Fragment"
+        }
+      ]
+    }
+}
@@ -0,0 +1,32 @@
+{
+    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "propertyLayoutVersion": 1,
+    "properties": {
+        "baseColor": {
+            "color": [ 0.18, 0.18, 0.18 ],
+            "factor": 1.0,
+            "useTexture": false,
+            "textureMap": ""
+        },
+        "metallic": {
+            "factor": 0.0,
+            "useTexture": false,
+            "textureMap": ""
+        },
+        "roughness": {
+            "factor": 1.0,
+            "useTexture": false,
+            "textureMap": ""
+        },
+        "specularF0": {
+            "factor": 0.5,
+            "useTexture": false,
+            "textureMap": ""
+        },
+        "normal": {
+            "factor": 1.0,
+            "useTexture": false,
+            "textureMap": ""
+        }
+    }
+}