Merge pull request #54 from aws-lumberyard/Apple_Tree_size_pos_Update

Apple tree size pos update

Project/Assets/apple_tree/AppleTree_Leaf_SSS_MAT.material

@@ -0,0 +1,37 @@
+{
+    "materialType": "@gemroot:Atom_Feature_Common@/Assets/Materials/Types/EnhancedPBR.materialtype",
+    "materialTypeVersion": 6,
+    "propertyValues": {
+        "baseColor.textureBlendMode": "Lerp",
+        "baseColor.textureMap": "textures/AppleTreeLeaf_BaseColor_lod0.png",
+        "general.doubleSided": true,
+        "irradiance.irradianceColorSource": "BaseColor",
+        "normal.textureMap": "textures/AppleTreeLeaf_Normal_lod0.png",
+        "opacity.alphaSource": "Split",
+        "opacity.factor": 0.5199999809265137,
+        "opacity.mode": "Cutout",
+        "opacity.textureMap": "textures/AppleTreeLeaf_Opacity_lod0.png",
+        "roughness.factor": 0.6200000047683716,
+        "subsurfaceScattering.distanceAttenuation": 0.0,
+        "subsurfaceScattering.enableSubsurfaceScattering": true,
+        "subsurfaceScattering.scatterColor": [
+            1.0,
+            1.0,
+            1.0,
+            1.0
+        ],
+        "subsurfaceScattering.scatterDistance": 2.4000000953674316,
+        "subsurfaceScattering.shrinkFactor": 0.0,
+        "subsurfaceScattering.thickness": 0.7300000190734863,
+        "subsurfaceScattering.thicknessMap": "textures/AppleTreeLeaf_Thickness_lod0.png",
+        "subsurfaceScattering.transmissionMode": "ThinObject",
+        "subsurfaceScattering.transmissionNdLBias": -0.18000000715255737,
+        "subsurfaceScattering.transmissionScale": 0.800000011920929,
+        "subsurfaceScattering.transmissionTint": [
+            0.2859998345375061,
+            0.3333333432674408,
+            0.22815290093421936,
+            1.0
+        ]
+    }
+}

Project/Assets/apple_tree/AppleTree_TreeMAT.material

@@ -1,5 +1,5 @@
 {
-    "materialType": "Materials/Types/StandardPBR.materialtype",
+    "materialType": "@gemroot:Atom_Feature_Common@/Assets/Materials/Types/StandardPBR.materialtype",
     "materialTypeVersion": 5,
     "propertyValues": {
         "baseColor.color": [
@@ -9,7 +9,7 @@
             1.0
         ],
         "baseColor.textureBlendMode": "Lerp",
-        "baseColor.textureMap": "Assets/apple_tree/textures/TreeMAT_BaseColor_lod0.png",
+        "baseColor.textureMap": "textures/TreeMAT_BaseColor_lod0.png",
         "emissive.color": [
             0.0,
             0.0,
@@ -17,8 +17,10 @@
             1.0
         ],
         "irradiance.irradianceColorSource": "BaseColor",
-        "normal.textureMap": "Assets/apple_tree/textures/TreeMAT_Normal_lod0.png",
+        "normal.factor": 1.059999942779541,
+        "normal.textureMap": "textures/TreeMAT_Normal_lod0.png",
         "opacity.factor": 1.0,
-        "roughness.factor": 0.8700000047683716
+        "roughness.factor": 0.6499999761581421,
+        "specularF0.factor": 0.3400000035762787
     }
 }

Project/Assets/apple_tree/textures/AppleTreeLeaf_BaseColor_lod0.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:0d1c1cef754f75d00ab9617808378a843c73604ccb31b57c79381a78b0be35ea
-size 407703
+oid sha256:f194bc95192ed04f1d143d243672c79864f66ba202dfe7b19b0dd00372035f6d
+size 1955741

Project/Assets/apple_tree/textures/AppleTreeLeaf_BaseColor_lod1.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5d32f3726ca5e7dcc46c2f8f3c242f0c96948136b67cbce4dcd275c11b8e1f8b
-size 184247
+oid sha256:55a89e9cc9375db8027dbd1b6331378c8bfff02d7bfe89c2b7c71c0a77b84da9
+size 806986

Project/Assets/apple_tree/textures/AppleTreeLeaf_BaseColor_lod2.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:da76f8bbcb772ad5309acbe1d9ae0026f5ee59010c6a1ae8d6d23108669869d4
-size 66006
+oid sha256:2fec85aa71884056052f0e545663684b7c4f99e8a92cc3dd1bb005dd83835fec
+size 279353

Project/Assets/apple_tree/textures/AppleTreeLeaf_BaseColor_lod3.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:116ca1dd28dd80cdfcdf765e04b271e264e85293a034d63d14c1c691bd7aecbb
-size 26545
+oid sha256:7811713044f6342764302f3a64acb5bbbff862188166100e50881281986163b7
+size 93363

Project/Assets/apple_tree/textures/AppleTreeLeaf_Normal_lod0.png

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

Project/Assets/apple_tree/textures/AppleTreeLeaf_Normal_lod1.png

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

Project/Assets/apple_tree/textures/AppleTreeLeaf_Normal_lod2.png

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

Project/Assets/apple_tree/textures/AppleTreeLeaf_Normal_lod3.png

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

Project/Assets/apple_tree/textures/AppleTreeLeaf_Thickness_lod0.png

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

Project/Assets/apple_tree/textures/AppleTreeLeaf_Thickness_lod1.png

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

Project/Assets/apple_tree/textures/AppleTreeLeaf_Thickness_lod2.png

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

Project/Assets/apple_tree/textures/AppleTreeLeaf_Thickness_lod3.png

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

Project/Assets/apple_tree/textures/TreeMAT_BaseColor_lod0.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8f128f49af9e55f0b8fc8b80da7cb946f631a5a8994266cd2f12c63d68f10ce6
-size 11308545
+oid sha256:af3f9def4039eccc8e8326e1f422d41316a9a9a7376243ab303a3a839287b537
+size 12966326

Project/Assets/apple_tree/textures/TreeMAT_BaseColor_lod1.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c1921df90ab42bdfff96a4a765ccad56b8910e44399a71ccb4f00e33f0f913ca
-size 4179854
+oid sha256:a2671edf02d3d726cb53341de5d74171fd988b6766733926f1380e57f4124e80
+size 5258982

Project/Assets/apple_tree/textures/TreeMAT_BaseColor_lod2.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7c9a5c1f288ee1ba7c45916549d714609c1c3f8bed38cf0031111b4c17080dfc
-size 1225785
+oid sha256:bb6bc6bca2d4983c20ce98f8b47ddcdb52dcc7dcc144e4af8615f864211f29c5
+size 1634325

Project/Assets/apple_tree/textures/TreeMAT_BaseColor_lod3.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:478f8adf606141fed5507e05aaa119e44a224e6b252f82514f65f0dd48210bdf
-size 363499
+oid sha256:4462809303110ed7a505dc6886a52b54cc2c55c2011ec78d17546b655a01dd53
+size 443775

Project/Assets/apple_tree/textures/TreeMAT_Normal_lod0.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:357857362b39250f116881599328fa2212e5f7a85de59f9099e22f996b37d745
-size 9893529
+oid sha256:4b0aa51460ce60ed2e77b7ee77583830ad1bcceb510078f4c1e0bbdf3cf48cdc
+size 16261397

Project/Assets/apple_tree/textures/TreeMAT_Normal_lod1.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:db9535206ed275f3a2db97c66fc967824506c4ecc6abde8d4c669e0af07fe36e
-size 5152845
+oid sha256:0b9cca4edcae4018b30b487dcd376edb7204ba9e37550c9801751a2d617a4a17
+size 6199177

Project/Assets/apple_tree/textures/TreeMAT_Normal_lod2.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:8fd563c8c8d1d9678e6d2a1b97a71ed5cb7155490f13ae42380956cfc1effdf4
-size 1573399
+oid sha256:6cc1852de60a7d1e5c14380d2a1f7f76f2f9a82e34af4bf6280a6db2637205c1
+size 2003431

Project/Assets/apple_tree/textures/TreeMAT_Normal_lod3.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c50dc73cef70d8667f6bb58d86e328d4d34315d708567d9c768b15515efa191e
-size 450244
+oid sha256:9c979eb2817c5ed9ea2e66cdfbcaa497f78f41e1ca07afb35d907c7bce188e8c
+size 544341

Project/project.json

@@ -1,23 +1,23 @@
-{
-    "project_name": "ROSConDemo",
-    "project_id": "{A871E69A-15DA-4A3B-9A47-EC994B37FD3C}",
-    "origin": "The primary repo for ROSConDemo goes here: i.e. http://www.mydomain.com",
-    "license": "What license ROSConDemo uses goes here: i.e. https://opensource.org/licenses/Apache-2.0 Or https://opensource.org/licenses/MIT etc.",
-    "display_name": "ROSConDemo",
-    "summary": "A short description of ROSConDemo.",
-    "canonical_tags": [
-        "Project"
-    ],
-    "user_tags": [
-        "ROSConDemo"
-    ],
-    "icon_path": "preview.png",
-    "engine": "o3de",
-    "external_subdirectories": [
-        "Gem"
-    ],
-    "restricted": "ROSConDemo",
-    "gem_names": [
-        "ROS2"
-    ]
-}
+{
+    "project_name": "ROSConDemo",
+    "project_id": "{A871E69A-15DA-4A3B-9A47-EC994B37FD3C}",
+    "origin": "The primary repo for ROSConDemo goes here: i.e. http://www.mydomain.com",
+    "license": "What license ROSConDemo uses goes here: i.e. https://opensource.org/licenses/Apache-2.0 Or https://opensource.org/licenses/MIT etc.",
+    "display_name": "ROSConDemo",
+    "summary": "A short description of ROSConDemo.",
+    "canonical_tags": [
+        "Project"
+    ],
+    "user_tags": [
+        "ROSConDemo"
+    ],
+    "icon_path": "preview.png",
+    "engine": "o3de",
+    "external_subdirectories": [
+        "Gem"
+    ],
+    "restricted": "ROSConDemo",
+    "gem_names": [
+        "ROS2"
+    ]
+}

Project/project.json.bak1

@@ -0,0 +1,23 @@
+{
+    "project_name": "ROSConDemo",
+    "project_id": "{A871E69A-15DA-4A3B-9A47-EC994B37FD3C}",
+    "origin": "The primary repo for ROSConDemo goes here: i.e. http://www.mydomain.com",
+    "license": "What license ROSConDemo uses goes here: i.e. https://opensource.org/licenses/Apache-2.0 Or https://opensource.org/licenses/MIT etc.",
+    "display_name": "ROSConDemo",
+    "summary": "A short description of ROSConDemo.",
+    "canonical_tags": [
+        "Project"
+    ],
+    "user_tags": [
+        "ROSConDemo"
+    ],
+    "icon_path": "preview.png",
+    "engine": "o3de",
+    "external_subdirectories": [
+        "Gem"
+    ],
+    "restricted": "ROSConDemo",
+    "gem_names": [
+        "ROS2"
+    ]
+}