birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Integrating latest 47acbe8

Browse Source
This commit is contained in:
alexpete
2021-03-25 13:57:57 -07:00
parent 448c549698
commit 75dc720198
10312 changed files with 2711566 additions and 671451 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AutomatedTesting/Assets/Objects/Foliage/Textures/bush_privet_01_frond_diff.tif
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0d6a7892f3f1addf37cdc2a97a324a83ae7e746b2acc08d89f0718eeb529f9e2
size 2104670
AutomatedTesting/Assets/Objects/Foliage/Textures/bush_privet_01_tile_diff.tif
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:2c7ef23555bdd2abf939df88fec14accebc619b757018c9cbc2c3e00c8df1e11
size 3157354
AutomatedTesting/Assets/Objects/Foliage/Textures/cedar_bark_diff.tif
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:67fe2201f7405e2f58fb8348d79823a1b46089a906417891cb4c91c8eedfb9c4
size 3157328
AutomatedTesting/Assets/Objects/Foliage/Textures/cedar_diff.tif
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e290729d6662b18c2db9d3c7097516d0ef4b46a751a90314031f7f6bdc0579f7
size 4205904
AutomatedTesting/Assets/Objects/Foliage/Textures/grass_atlas_diff.tif
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f82170e7be5119ea43b7bd7fe3247091c81367909a29abebbfe833069f2ccab3
size 16797024
AutomatedTesting/Assets/Objects/Foliage/Textures/grass_atlas_diff.tif.exportsettings
+1
View File
@@ -0,0 +1 @@
/autooptimizefile=0 /preset=AlbedoWithGenericAlpha /reduce="es3:2,ios:2,osx_gl:0,pc:0,provo:0"
AutomatedTesting/Assets/Objects/Foliage/Textures/grass_atlas_sss.tif
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:ea071a4f9333bdadcd8fe1fffd4a676aa07cd3bf15b0cf84d38a253c8df1a262
size 12602718
AutomatedTesting/Assets/Objects/Foliage/Textures/grass_atlas_sss.tif.exportsettings
+1
View File
@@ -0,0 +1 @@
/autooptimizefile=0 /preset=Albedo /reduce="es3:3,ios:3,osx_gl:0,pc:0,provo:0"
AutomatedTesting/Assets/Objects/Foliage/Textures/grass_upnormals_01_ddn.tif
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:165fdbf33b584093826e19f9089cfc46ead5e07d3f3dbcbbe35be670eec40079
size 3418
AutomatedTesting/Assets/Objects/Foliage/bush_privet_01.fbx
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b4ded3a6782d7c306f6c24914ebc8e585574ad79b22db9854a15d21f80a1cb64
size 96736
AutomatedTesting/Assets/Objects/Foliage/bush_privet_01.mtl
+21
View File
@@ -0,0 +1,21 @@
<Material MtlFlags="557312" DccMaterialHash="0" vertModifType="0">
<SubMaterials>
<Material Name="PhysicsNoDraw" MtlFlags="558208" DccMaterialHash="0" Shader="Nodraw" GenMask="0" StringGenMask="" SurfaceType="mat_default" Diffuse="1,1,1,1" Specular="0,0,0,0.0078740204" Opacity="1" Shininess="2.0078752" vertModifType="0" LayerAct="1">
<Textures>
<Texture Map="Diffuse" File="EngineAssets/Textures/white.dds"/>
</Textures>
</Material>
<Material Name="AM_Bush_Privet_01_Frond_M" MtlFlags="524416" DccMaterialHash="0" Shader="Vegetation" GenMask="2400000000" StringGenMask="%TEMP_VEGETATION%VERTCOLORS" SurfaceType="mat_vegetation" Diffuse="0.79910284,0.79910284,0.79910284,1" Specular="0.035601322,0.035601322,0.035601322,1" Opacity="1" Shininess="2.007875" AlphaTest="0.090000004" vertModifType="0" LayerAct="1">
<Textures>
<Texture Map="Diffuse" File="assets/objects/foliage/textures/bush_privet_01_frond_diff.dds"/>
</Textures>
<PublicParams bendDetailLeafAmplitude="0.2" bendDetailFrequency="1" bendDetailBranchAmplitude="-0.5" BlendTerrainCol="0" BlendTerrainColDist="0.5" IndirectColor="0.25,0.25,0.25"/>
</Material>
<Material Name="AM_Bush_Privet_01_Tile_M" MtlFlags="524416" DccMaterialHash="0" Shader="Vegetation" GenMask="2400000000" StringGenMask="%TEMP_VEGETATION%VERTCOLORS" SurfaceType="mat_vegetation" Diffuse="0.80000001,0.80000001,0.80000001,1" Specular="0.018500222,0.018500222,0.018500222,1" Opacity="1" Shininess="20" AlphaTest="0.52999997" vertModifType="0" LayerAct="1">
<Textures>
<Texture Map="Diffuse" File="assets/objects/foliage/textures/bush_privet_01_tile_diff.dds"/>
</Textures>
<PublicParams bendDetailLeafAmplitude="0.2" bendDetailFrequency="1" bendDetailBranchAmplitude="-0.5" BlendTerrainCol="0" BlendTerrainColDist="0.5" IndirectColor="0.25,0.25,0.25"/>
</Material>
</SubMaterials>
</Material>
AutomatedTesting/Assets/Objects/Foliage/cedar.fbx
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:586bc5cc8b33296c9a88665db4005c023fc13f8674ba7bc9ddff645697720b18
size 363968
AutomatedTesting/Assets/Objects/Foliage/cedar.mtl
+22
View File
@@ -0,0 +1,22 @@
<Material MtlFlags="557312" DccMaterialHash="1463055164" vertModifType="0">
<SubMaterials>
<Material Name="PhysicsNoDraw" MtlFlags="558208" DccMaterialHash="2870446454" Shader="Nodraw" GenMask="0" StringGenMask="" SurfaceType="mat_default" Diffuse="1,1,1,1" Specular="0,0,0,0.0078740194" Opacity="1" Shininess="2.007875" vertModifType="0" LayerAct="1">
<Textures>
<Texture Map="Diffuse" File="EngineAssets/Textures/white.dds"/>
</Textures>
</Material>
<Material Name="AM_Cedar_leaf" MtlFlags="524416" DccMaterialHash="3388438472" Shader="Vegetation" GenMask="2400000000" StringGenMask="%TEMP_VEGETATION%VERTCOLORS" SurfaceType="mat_vegetation" Diffuse="0.54572457,0.54572457,0.54572457,1" Specular="0,0,0,1" Opacity="1" Shininess="10" AlphaTest="0.60000002" vertModifType="0" LayerAct="1">
<Textures>
<Texture Map="Diffuse" File="assets/objects/foliage/textures/cedar_diff.dds"/>
</Textures>
<PublicParams bendDetailLeafAmplitude="0.2" bendDetailFrequency="1" bendDetailBranchAmplitude="-0.5" BlendTerrainCol="0" BlendTerrainColDist="0.5" IndirectColor="0.25,0.25,0.25"/>
</Material>
<Material Name="AM_Cedar_bark" MtlFlags="524416" DccMaterialHash="2189260962" Shader="Vegetation" GenMask="2400000000" StringGenMask="%TEMP_VEGETATION%VERTCOLORS" SurfaceType="mat_wood" Diffuse="0.80000001,0.80000001,0.80000001,1" Specular="0.042311415,0.042311415,0.042311415,1" Opacity="1" Shininess="2.0078743" vertModifType="0" LayerAct="1">
<Textures>
<Texture Map="Diffuse" File="assets/objects/foliage/textures/cedar_bark_diff.dds"/>
</Textures>
<PublicParams bendDetailLeafAmplitude="0.2" bendDetailFrequency="1" bendDetailBranchAmplitude="-0.5" BlendTerrainCol="0" BlendTerrainColDist="0.5" IndirectColor="0.25,0.25,0.25"/>
</Material>
</SubMaterials>
<PublicParams />
</Material>
AutomatedTesting/Assets/Objects/Foliage/grass_flower_pink.fbx
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:35e6b123dcefc9d765609afc0d9ba31a9edf1253e0b7a7afa5d36210802f0ba4
size 42320
AutomatedTesting/Assets/Objects/Foliage/grass_flower_pink.mtl
+14
View File
@@ -0,0 +1,14 @@
<Material MtlFlags="524544" DccMaterialHash="0" vertModifType="0">
<SubMaterials>
<Material Name="Grass_Atlas" MtlFlags="524416" DccMaterialHash="0" Shader="Vegetation" GenMask="200002400201000" StringGenMask="%DETAIL_BENDING%GRASS%NORMAL_MAP%TEMP_VEGETATION%VERTCOLORS" SurfaceType="mat_default" Diffuse="1,1,1,1" Specular="0,0,0,1" Opacity="1" Shininess="10" AlphaTest="0.46000001" vertModifType="0" LayerAct="1">
<Textures>
<Texture Map="Diffuse" File="assets/objects/foliage/textures/grass_atlas_diff.dds">
<TexMod TexMod_RotateType="0" TexMod_TexGenType="0" TexMod_bTexGenProjected="0"/>
</Texture>
<Texture Map="Bumpmap" File="assets/objects/foliage/textures/grass_upnormals_01_ddn.dds"/>
<Texture Map="Opacity" File="assets/objects/foliage/textures/grass_atlas_sss.dds"/>
</Textures>
<PublicParams bendDetailLeafAmplitude="0.2" bendDetailFrequency="1" bendDetailBranchAmplitude="-0.5" BlendTerrainCol="0" NormalViewDependency="0.5" TransmittanceColor="1,1,0.60000002" BackDiffuseMultiplier="1" BlendTerrainColDist="0.5" IndirectColor="0.25,0.25,0.25"/>
</Material>
</SubMaterials>
</Material>
AutomatedTesting/Assets/Objects/Foliage/grass_flower_purple.fbx
+3
View File
@@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:40bfa2a910ac2a9530245320c5838c6143054b0165db62eca7fc2201377f9a9c
size 41872
AutomatedTesting/Assets/Objects/Foliage/grass_flower_purple.mtl
+12
View File
@@ -0,0 +1,12 @@
<Material MtlFlags="524544" DccMaterialHash="0" vertModifType="0">
<SubMaterials>
<Material Name="Grass_Atlas" MtlFlags="524416" DccMaterialHash="0" Shader="Vegetation" GenMask="200002400201000" StringGenMask="%DETAIL_BENDING%GRASS%NORMAL_MAP%TEMP_VEGETATION%VERTCOLORS" SurfaceType="mat_default" Diffuse="1,1,1,1" Specular="0,0,0,1" Opacity="1" Shininess="10" AlphaTest="0.46000001" vertModifType="0" LayerAct="1">
<Textures>
<Texture Map="Diffuse" File="assets/objects/foliage/textures/grass_atlas_diff.dds"/>
<Texture Map="Bumpmap" File="assets/objects/foliage/textures/grass_upnormals_01_ddn.dds"/>
<Texture Map="Opacity" File="assets/objects/foliage/textures/grass_atlas_sss.dds"/>
</Textures>
<PublicParams bendDetailLeafAmplitude="0.2" bendDetailFrequency="1" bendDetailBranchAmplitude="-0.5" BlendTerrainCol="0" NormalViewDependency="0.5" TransmittanceColor="1,1,0.60000002" BackDiffuseMultiplier="1" BlendTerrainColDist="0.5" IndirectColor="0.25,0.25,0.25"/>
</Material>
</SubMaterials>
</Material>