2
0
Эх сурвалжийг харах

Updated Tree Textures @shawstar

Signed-off-by: shawstar <[email protected]>
shawstar 3 жил өмнө
parent
commit
ca920d0594
26 өөрчлөгдсөн 246 нэмэгдсэн , 160 устгасан
  1. 37 0
      Project/Assets/apple_tree/AppleTree_Leaf_SSS_MAT.material
  2. 6 4
      Project/Assets/apple_tree/AppleTree_TreeMAT.material
  3. 2 2
      Project/Assets/apple_tree/textures/AppleTreeLeaf_BaseColor_lod0.png
  4. 2 2
      Project/Assets/apple_tree/textures/AppleTreeLeaf_BaseColor_lod1.png
  5. 2 2
      Project/Assets/apple_tree/textures/AppleTreeLeaf_BaseColor_lod2.png
  6. 2 2
      Project/Assets/apple_tree/textures/AppleTreeLeaf_BaseColor_lod3.png
  7. 3 0
      Project/Assets/apple_tree/textures/AppleTreeLeaf_Normal_lod0.png
  8. 3 0
      Project/Assets/apple_tree/textures/AppleTreeLeaf_Normal_lod1.png
  9. 3 0
      Project/Assets/apple_tree/textures/AppleTreeLeaf_Normal_lod2.png
  10. 3 0
      Project/Assets/apple_tree/textures/AppleTreeLeaf_Normal_lod3.png
  11. 3 0
      Project/Assets/apple_tree/textures/AppleTreeLeaf_Thickness_lod0.png
  12. 3 0
      Project/Assets/apple_tree/textures/AppleTreeLeaf_Thickness_lod1.png
  13. 3 0
      Project/Assets/apple_tree/textures/AppleTreeLeaf_Thickness_lod2.png
  14. 3 0
      Project/Assets/apple_tree/textures/AppleTreeLeaf_Thickness_lod3.png
  15. 2 2
      Project/Assets/apple_tree/textures/TreeMAT_BaseColor_lod0.png
  16. 2 2
      Project/Assets/apple_tree/textures/TreeMAT_BaseColor_lod1.png
  17. 2 2
      Project/Assets/apple_tree/textures/TreeMAT_BaseColor_lod2.png
  18. 2 2
      Project/Assets/apple_tree/textures/TreeMAT_BaseColor_lod3.png
  19. 2 2
      Project/Assets/apple_tree/textures/TreeMAT_Normal_lod0.png
  20. 2 2
      Project/Assets/apple_tree/textures/TreeMAT_Normal_lod1.png
  21. 2 2
      Project/Assets/apple_tree/textures/TreeMAT_Normal_lod2.png
  22. 2 2
      Project/Assets/apple_tree/textures/TreeMAT_Normal_lod3.png
  23. 96 96
      Project/Levels/Main/Main.prefab
  24. 13 13
      Project/Prefabs/AppleTree.prefab
  25. 23 23
      Project/project.json
  26. 23 0
      Project/project.json.bak1

+ 37 - 0
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
+        ]
+    }
+}

+ 6 - 4
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
     }
 }

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
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

+ 3 - 0
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

+ 3 - 0
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

+ 3 - 0
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

+ 3 - 0
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

+ 3 - 0
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

+ 3 - 0
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

+ 3 - 0
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

+ 3 - 0
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

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
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

+ 2 - 2
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

+ 96 - 96
Project/Levels/Main/Main.prefab

@@ -643,14 +643,14 @@
                     "Parent Entity": "Entity_[1176639161715]",
                     "Transform Data": {
                         "Translate": [
-                            14.164230346679688,
-                            -9.998714447021484,
-                            12.541990280151367
+                            -66.45108795166016,
+                            -3.669436454772949,
+                            2.0222959518432617
                         ],
                         "Rotate": [
-                            -14.504185676574707,
-                            -17.13734245300293,
-                            48.718997955322266
+                            -6.956013202667236,
+                            5.778761863708496,
+                            -39.53181457519531
                         ]
                     }
                 },
@@ -1562,7 +1562,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -0.730255126953125,
+                            -20.230255126953125,
                             18.086706161499023,
                             0.0
                         ],
@@ -1664,7 +1664,7 @@
                             1.0
                         ],
                         "Translate": [
-                            4.269744873046875,
+                            -16.730255126953125,
                             18.086706161499023,
                             0.0
                         ],
@@ -1767,7 +1767,7 @@
                             1.0
                         ],
                         "Translate": [
-                            10.120895385742188,
+                            -12.379104614257813,
                             18.086706161499023,
                             0.0
                         ]
@@ -1862,7 +1862,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -5.730255126953125,
+                            -23.730255126953125,
                             18.086706161499023,
                             0.0
                         ],
@@ -1964,7 +1964,7 @@
                             1.0
                         ],
                         "Translate": [
-                            5.1208953857421875,
+                            -15.879104614257813,
                             18.086706161499023,
                             0.0
                         ]
@@ -2062,7 +2062,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -4.8791046142578125,
+                            -22.879104614257813,
                             18.086706161499023,
                             0.0
                         ]
@@ -2157,7 +2157,7 @@
                             1.0
                         ],
                         "Translate": [
-                            10.120895385742188,
+                            -12.379104614257813,
                             18.086706161499023,
                             0.0
                         ]
@@ -2264,7 +2264,7 @@
                     "Parent Entity": "Entity_[1146574390643]",
                     "Transform Data": {
                         "Translate": [
-                            10.0,
+                            -12.5,
                             17.41720962524414,
                             0.0
                         ]
@@ -2332,7 +2332,7 @@
                         "RangeMaxX": 0.009999999776482582,
                         "GradientX": {
                             "GradientId": "Entity_[1201962595331732]",
-                            "Opacity": 0.15000000596046448,
+                            "Opacity": 0.009999999776482582,
                             "Translate": [
                                 10.0,
                                 0.0,
@@ -2474,7 +2474,7 @@
                             1.0
                         ],
                         "Translate": [
-                            9.269744873046875,
+                            -13.230255126953125,
                             18.086706161499023,
                             0.0
                         ],
@@ -2586,7 +2586,7 @@
                     "Parent Entity": "Entity_[1146574390643]",
                     "Transform Data": {
                         "Translate": [
-                            5.0,
+                            -16.0,
                             17.41720962524414,
                             0.0
                         ]
@@ -2654,7 +2654,7 @@
                         "RangeMaxX": 0.009999999776482582,
                         "GradientX": {
                             "GradientId": "Entity_[1201996955070100]",
-                            "Opacity": 0.15000000596046448,
+                            "Opacity": 0.009999999776482582,
                             "Translate": [
                                 10.0,
                                 0.0,
@@ -2797,7 +2797,7 @@
                             1.0
                         ],
                         "Translate": [
-                            5.1208953857421875,
+                            -15.879104614257813,
                             18.086706161499023,
                             0.0
                         ]
@@ -2902,7 +2902,7 @@
                     "Parent Entity": "Entity_[1146574390643]",
                     "Transform Data": {
                         "Translate": [
-                            0.0,
+                            -19.5,
                             17.41720962524414,
                             0.0
                         ]
@@ -2970,7 +2970,7 @@
                         "RangeMaxX": 0.009999999776482582,
                         "GradientX": {
                             "GradientId": "Entity_[1202005545004692]",
-                            "Opacity": 0.15000000596046448,
+                            "Opacity": 0.009999999776482582,
                             "Translate": [
                                 10.0,
                                 0.0,
@@ -3113,7 +3113,7 @@
                             1.0
                         ],
                         "Translate": [
-                            0.1208953857421875,
+                            -19.379104614257813,
                             18.086706161499023,
                             0.0
                         ]
@@ -3208,7 +3208,7 @@
                             1.0
                         ],
                         "Translate": [
-                            0.1208953857421875,
+                            -19.379104614257813,
                             18.086706161499023,
                             0.0
                         ]
@@ -3315,7 +3315,7 @@
                     "Parent Entity": "Entity_[1146574390643]",
                     "Transform Data": {
                         "Translate": [
-                            -5.0,
+                            -23.0,
                             17.41720962524414,
                             0.0
                         ]
@@ -3383,7 +3383,7 @@
                         "RangeMaxX": 0.009999999776482582,
                         "GradientX": {
                             "GradientId": "Entity_[1201975480233620]",
-                            "Opacity": 0.15000000596046448,
+                            "Opacity": 0.009999999776482582,
                             "Translate": [
                                 10.0,
                                 0.0,
@@ -3525,7 +3525,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -4.8791046142578125,
+                            -22.879104614257813,
                             18.086706161499023,
                             0.0
                         ]
@@ -6266,7 +6266,7 @@
                             1.0
                         ],
                         "Translate": [
-                            15.120895385742188,
+                            -8.879104614257813,
                             18.086706161499023,
                             0.0
                         ]
@@ -6364,7 +6364,7 @@
                             1.0
                         ],
                         "Translate": [
-                            15.120895385742188,
+                            -8.879104614257813,
                             18.086706161499023,
                             0.0
                         ]
@@ -6459,7 +6459,7 @@
                             1.0
                         ],
                         "Translate": [
-                            25.120895385742188,
+                            -1.8791046142578125,
                             18.086706161499023,
                             0.0
                         ]
@@ -6557,7 +6557,7 @@
                             1.0
                         ],
                         "Translate": [
-                            20.120895385742188,
+                            -5.3791046142578125,
                             18.086706161499023,
                             0.0
                         ]
@@ -6653,7 +6653,7 @@
                             1.0
                         ],
                         "Translate": [
-                            25.120895385742188,
+                            -1.8791046142578125,
                             18.086706161499023,
                             0.0
                         ]
@@ -6748,7 +6748,7 @@
                             1.0
                         ],
                         "Translate": [
-                            20.120895385742188,
+                            -5.3791046142578125,
                             18.086706161499023,
                             0.0
                         ]
@@ -6845,7 +6845,7 @@
                             1.0
                         ],
                         "Translate": [
-                            19.269744873046875,
+                            -6.230255126953125,
                             18.086706161499023,
                             0.0
                         ],
@@ -6947,7 +6947,7 @@
                             1.0
                         ],
                         "Translate": [
-                            14.269744873046875,
+                            -9.730255126953125,
                             18.086706161499023,
                             0.0
                         ],
@@ -7059,7 +7059,7 @@
                     "Parent Entity": "Entity_[1146574390643]",
                     "Transform Data": {
                         "Translate": [
-                            15.0,
+                            -9.0,
                             17.41720962524414,
                             0.0
                         ]
@@ -7127,7 +7127,7 @@
                         "RangeMaxX": 0.009999999776482582,
                         "GradientX": {
                             "GradientId": "Entity_[1574619727736468]",
-                            "Opacity": 0.15000000596046448,
+                            "Opacity": 0.009999999776482582,
                             "Translate": [
                                 10.0,
                                 0.0,
@@ -7279,7 +7279,7 @@
                     "Parent Entity": "Entity_[1146574390643]",
                     "Transform Data": {
                         "Translate": [
-                            25.0,
+                            -2.0,
                             17.41720962524414,
                             0.0
                         ]
@@ -7347,7 +7347,7 @@
                         "RangeMaxX": 0.009999999776482582,
                         "GradientX": {
                             "GradientId": "Entity_[1574632612638356]",
-                            "Opacity": 0.15000000596046448,
+                            "Opacity": 0.009999999776482582,
                             "Translate": [
                                 10.0,
                                 0.0,
@@ -7489,7 +7489,7 @@
                             1.0
                         ],
                         "Translate": [
-                            24.269744873046875,
+                            -2.730255126953125,
                             18.086706161499023,
                             0.0
                         ],
@@ -7601,7 +7601,7 @@
                     "Parent Entity": "Entity_[1146574390643]",
                     "Transform Data": {
                         "Translate": [
-                            20.0,
+                            -5.5,
                             17.41720962524414,
                             0.0
                         ]
@@ -7669,7 +7669,7 @@
                         "RangeMaxX": 0.009999999776482582,
                         "GradientX": {
                             "GradientId": "Entity_[1574628317671060]",
-                            "Opacity": 0.15000000596046448,
+                            "Opacity": 0.009999999776482582,
                             "Translate": [
                                 10.0,
                                 0.0,
@@ -8225,7 +8225,7 @@
                         "RangeMaxX": 0.009999999776482582,
                         "GradientX": {
                             "GradientId": "Entity_[1961516426450979]",
-                            "Opacity": 0.15000000596046448,
+                            "Opacity": 0.009999999776482582,
                             "Translate": [
                                 10.0,
                                 0.0,
@@ -9361,7 +9361,7 @@
                     "Parent Entity": "Entity_[1146574390643]",
                     "Transform Data": {
                         "Translate": [
-                            -60.0,
+                            -61.5,
                             17.41720962524414,
                             0.0
                         ]
@@ -9429,7 +9429,7 @@
                         "RangeMaxX": 0.009999999776482582,
                         "GradientX": {
                             "GradientId": "Entity_[519392521838890]",
-                            "Opacity": 0.15000000596046448,
+                            "Opacity": 0.009999999776482582,
                             "Translate": [
                                 10.0,
                                 0.0,
@@ -9571,7 +9571,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -59.87910461425781,
+                            -61.37910461425781,
                             18.086706161499023,
                             0.0
                         ]
@@ -9669,7 +9669,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -59.87910461425781,
+                            -61.37910461425781,
                             18.086706161499023,
                             0.0
                         ]
@@ -9764,7 +9764,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -60.730255126953125,
+                            -62.230255126953125,
                             18.086706161499023,
                             0.0
                         ],
@@ -9866,7 +9866,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -55.730255126953125,
+                            -58.730255126953125,
                             18.086706161499023,
                             0.0
                         ],
@@ -9968,7 +9968,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -54.87910461425781,
+                            -57.87910461425781,
                             18.086706161499023,
                             0.0
                         ]
@@ -10065,7 +10065,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -49.87910461425781,
+                            -54.37910461425781,
                             18.086706161499023,
                             0.0
                         ]
@@ -10162,7 +10162,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -50.730255126953125,
+                            -55.230255126953125,
                             18.086706161499023,
                             0.0
                         ],
@@ -10274,7 +10274,7 @@
                     "Parent Entity": "Entity_[1146574390643]",
                     "Transform Data": {
                         "Translate": [
-                            -55.0,
+                            -58.0,
                             17.41720962524414,
                             0.0
                         ]
@@ -10485,7 +10485,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -54.87910461425781,
+                            -57.87910461425781,
                             18.086706161499023,
                             0.0
                         ]
@@ -10590,7 +10590,7 @@
                     "Parent Entity": "Entity_[1146574390643]",
                     "Transform Data": {
                         "Translate": [
-                            -50.0,
+                            -54.5,
                             17.41720962524414,
                             0.0
                         ]
@@ -10658,7 +10658,7 @@
                         "RangeMaxX": 0.009999999776482582,
                         "GradientX": {
                             "GradientId": "Entity_[550463301168788]",
-                            "Opacity": 0.15000000596046448,
+                            "Opacity": 0.009999999776482582,
                             "Translate": [
                                 10.0,
                                 0.0,
@@ -10801,7 +10801,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -49.87910461425781,
+                            -54.37910461425781,
                             18.086706161499023,
                             0.0
                         ]
@@ -10973,7 +10973,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -34.87910461425781,
+                            -43.87910461425781,
                             18.086706161499023,
                             0.0
                         ]
@@ -11068,7 +11068,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -30.730255126953125,
+                            -41.230255126953125,
                             18.086706161499023,
                             0.0
                         ],
@@ -11170,7 +11170,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -34.87910461425781,
+                            -43.87910461425781,
                             18.086706161499023,
                             0.0
                         ]
@@ -11267,7 +11267,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -40.730255126953125,
+                            -48.230255126953125,
                             18.086706161499023,
                             0.0
                         ],
@@ -11370,7 +11370,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -39.87910461425781,
+                            -47.37910461425781,
                             18.086706161499023,
                             0.0
                         ]
@@ -11465,7 +11465,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -29.879104614257813,
+                            -40.37910461425781,
                             18.086706161499023,
                             0.0
                         ]
@@ -11562,7 +11562,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -39.87910461425781,
+                            -47.37910461425781,
                             18.086706161499023,
                             0.0
                         ]
@@ -11669,7 +11669,7 @@
                     "Parent Entity": "Entity_[1146574390643]",
                     "Transform Data": {
                         "Translate": [
-                            -35.0,
+                            -44.0,
                             17.41720962524414,
                             0.0
                         ]
@@ -11737,7 +11737,7 @@
                         "RangeMaxX": 0.009999999776482582,
                         "GradientX": {
                             "GradientId": "Entity_[711322711305876]",
-                            "Opacity": 0.15000000596046448,
+                            "Opacity": 0.009999999776482582,
                             "Translate": [
                                 10.0,
                                 0.0,
@@ -11879,7 +11879,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -44.87910461425781,
+                            -50.87910461425781,
                             18.086706161499023,
                             0.0
                         ]
@@ -11976,7 +11976,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -45.730255126953125,
+                            -51.730255126953125,
                             18.086706161499023,
                             0.0
                         ],
@@ -12078,7 +12078,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -35.730255126953125,
+                            -44.730255126953125,
                             18.086706161499023,
                             0.0
                         ],
@@ -12190,7 +12190,7 @@
                     "Parent Entity": "Entity_[1146574390643]",
                     "Transform Data": {
                         "Translate": [
-                            -30.0,
+                            -40.5,
                             17.41720962524414,
                             0.0
                         ]
@@ -12258,7 +12258,7 @@
                         "RangeMaxX": 0.009999999776482582,
                         "GradientX": {
                             "GradientId": "Entity_[711374250913428]",
-                            "Opacity": 0.15000000596046448,
+                            "Opacity": 0.009999999776482582,
                             "Translate": [
                                 10.0,
                                 0.0,
@@ -12401,7 +12401,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -29.879104614257813,
+                            -40.37910461425781,
                             18.086706161499023,
                             0.0
                         ]
@@ -12506,7 +12506,7 @@
                     "Parent Entity": "Entity_[1146574390643]",
                     "Transform Data": {
                         "Translate": [
-                            -45.0,
+                            -51.0,
                             17.41720962524414,
                             0.0
                         ]
@@ -12574,7 +12574,7 @@
                         "RangeMaxX": 0.009999999776482582,
                         "GradientX": {
                             "GradientId": "Entity_[711387135815316]",
-                            "Opacity": 0.15000000596046448,
+                            "Opacity": 0.009999999776482582,
                             "Translate": [
                                 10.0,
                                 0.0,
@@ -12726,7 +12726,7 @@
                     "Parent Entity": "Entity_[1146574390643]",
                     "Transform Data": {
                         "Translate": [
-                            -40.0,
+                            -47.5,
                             17.41720962524414,
                             0.0
                         ]
@@ -12794,7 +12794,7 @@
                         "RangeMaxX": 0.009999999776482582,
                         "GradientX": {
                             "GradientId": "Entity_[711339891175060]",
-                            "Opacity": 0.15000000596046448,
+                            "Opacity": 0.009999999776482582,
                             "Translate": [
                                 10.0,
                                 0.0,
@@ -12937,7 +12937,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -44.87910461425781,
+                            -50.87910461425781,
                             18.086706161499023,
                             0.0
                         ]
@@ -13105,7 +13105,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -24.879104614257813,
+                            -36.87910461425781,
                             18.086706161499023,
                             0.0
                         ]
@@ -13201,7 +13201,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -9.879104614257813,
+                            -26.379104614257813,
                             18.086706161499023,
                             0.0
                         ]
@@ -13296,7 +13296,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -9.879104614257813,
+                            -26.379104614257813,
                             18.086706161499023,
                             0.0
                         ]
@@ -13393,7 +13393,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -14.879104614257813,
+                            -29.879104614257813,
                             18.086706161499023,
                             0.0
                         ]
@@ -13490,7 +13490,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -19.879104614257813,
+                            -33.37910461425781,
                             18.086706161499023,
                             0.0
                         ]
@@ -13588,7 +13588,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -14.879104614257813,
+                            -29.879104614257813,
                             18.086706161499023,
                             0.0
                         ]
@@ -13683,7 +13683,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -25.730255126953125,
+                            -37.730255126953125,
                             18.086706161499023,
                             0.0
                         ],
@@ -13786,7 +13786,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -19.879104614257813,
+                            -33.37910461425781,
                             18.086706161499023,
                             0.0
                         ]
@@ -13881,7 +13881,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -20.730255126953125,
+                            -34.230255126953125,
                             18.086706161499023,
                             0.0
                         ],
@@ -13993,7 +13993,7 @@
                     "Parent Entity": "Entity_[1146574390643]",
                     "Transform Data": {
                         "Translate": [
-                            -25.0,
+                            -37.0,
                             17.41720962524414,
                             0.0
                         ]
@@ -14061,7 +14061,7 @@
                         "RangeMaxX": 0.009999999776482582,
                         "GradientX": {
                             "GradientId": "Entity_[926723911134868]",
-                            "Opacity": 0.15000000596046448,
+                            "Opacity": 0.009999999776482582,
                             "Translate": [
                                 10.0,
                                 0.0,
@@ -14203,7 +14203,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -10.730255126953125,
+                            -27.230255126953125,
                             18.086706161499023,
                             0.0
                         ],
@@ -14305,7 +14305,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -15.730255126953125,
+                            -30.730255126953125,
                             18.086706161499023,
                             0.0
                         ],
@@ -14417,7 +14417,7 @@
                     "Parent Entity": "Entity_[1146574390643]",
                     "Transform Data": {
                         "Translate": [
-                            -10.0,
+                            -26.5,
                             17.41720962524414,
                             0.0
                         ]
@@ -14485,7 +14485,7 @@
                         "RangeMaxX": 0.009999999776482582,
                         "GradientX": {
                             "GradientId": "Entity_[926728206102164]",
-                            "Opacity": 0.15000000596046448,
+                            "Opacity": 0.009999999776482582,
                             "Translate": [
                                 10.0,
                                 0.0,
@@ -14627,7 +14627,7 @@
                             1.0
                         ],
                         "Translate": [
-                            -24.879104614257813,
+                            -36.87910461425781,
                             18.086706161499023,
                             0.0
                         ]
@@ -14734,7 +14734,7 @@
                     "Parent Entity": "Entity_[1146574390643]",
                     "Transform Data": {
                         "Translate": [
-                            -20.0,
+                            -33.5,
                             17.41720962524414,
                             0.0
                         ]
@@ -14802,7 +14802,7 @@
                         "RangeMaxX": 0.009999999776482582,
                         "GradientX": {
                             "GradientId": "Entity_[926753975905940]",
-                            "Opacity": 0.15000000596046448,
+                            "Opacity": 0.009999999776482582,
                             "Translate": [
                                 10.0,
                                 0.0,
@@ -14954,7 +14954,7 @@
                     "Parent Entity": "Entity_[1146574390643]",
                     "Transform Data": {
                         "Translate": [
-                            -15.0,
+                            -30.0,
                             17.41720962524414,
                             0.0
                         ]
@@ -15022,7 +15022,7 @@
                         "RangeMaxX": 0.009999999776482582,
                         "GradientX": {
                             "GradientId": "Entity_[926745385971348]",
-                            "Opacity": 0.15000000596046448,
+                            "Opacity": 0.009999999776482582,
                             "Translate": [
                                 10.0,
                                 0.0,

+ 13 - 13
Project/Prefabs/AppleTree.prefab

@@ -113,9 +113,9 @@
                                     "Value": {
                                         "MaterialAsset": {
                                             "assetId": {
-                                                "guid": "{6B229DA0-87C1-5212-9892-D11894AC6C4C}"
+                                                "guid": "{A9A7956A-79C1-53A1-95C1-342AC7C3E8FB}"
                                             },
-                                            "assetHint": "assets/apple_tree/appletree_leafmat.azmaterial"
+                                            "assetHint": "assets/apple_tree/appletree_leaf_sss_mat.azmaterial"
                                         }
                                     }
                                 }
@@ -176,7 +176,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[17300195898860990188]/Transform Data/Translate/1",
-                    "value": -0.46243637800216675
+                    "value": -0.4624363780021667
                 },
                 {
                     "op": "replace",
@@ -266,7 +266,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[17300195898860990188]/Transform Data/Translate/1",
-                    "value": -0.36320945620536804
+                    "value": -0.363209456205368
                 },
                 {
                     "op": "replace",
@@ -296,7 +296,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[17300195898860990188]/Transform Data/Translate/1",
-                    "value": -0.10287938266992569
+                    "value": -0.10287938266992568
                 },
                 {
                     "op": "replace",
@@ -351,7 +351,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[17300195898860990188]/Transform Data/Translate/0",
-                    "value": 0.37859344482421875
+                    "value": 0.3785934448242187
                 },
                 {
                     "op": "replace",
@@ -381,7 +381,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[17300195898860990188]/Transform Data/Translate/0",
-                    "value": 0.10416412353515625
+                    "value": 0.10416412353515624
                 },
                 {
                     "op": "replace",
@@ -416,7 +416,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[17300195898860990188]/Transform Data/Translate/1",
-                    "value": 0.42196887731552124
+                    "value": 0.4219688773155213
                 },
                 {
                     "op": "replace",
@@ -721,7 +721,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[17300195898860990188]/Transform Data/Translate/2",
-                    "value": 1.2611603736877441
+                    "value": 1.261160373687744
                 },
                 {
                     "op": "replace",
@@ -751,7 +751,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[17300195898860990188]/Transform Data/Translate/2",
-                    "value": 1.0599949359893799
+                    "value": 1.05999493598938
                 },
                 {
                     "op": "replace",
@@ -861,7 +861,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[17300195898860990188]/Transform Data/Translate/0",
-                    "value": 0.45446014404296875
+                    "value": 0.4544601440429687
                 },
                 {
                     "op": "replace",
@@ -931,7 +931,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[17300195898860990188]/Transform Data/Translate/2",
-                    "value": 1.9938002824783325
+                    "value": 1.9938002824783323
                 },
                 {
                     "op": "replace",
@@ -1201,7 +1201,7 @@
                 {
                     "op": "replace",
                     "path": "/ContainerEntity/Components/Component_[17300195898860990188]/Transform Data/Translate/0",
-                    "value": -0.12009429931640625
+                    "value": -0.12009429931640624
                 },
                 {
                     "op": "replace",

+ 23 - 23
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"
+    ]
+}

+ 23 - 0
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"
+    ]
+}