From abc0beb07da5ff01dd8195286cd96d1e92ee7c9d Mon Sep 17 00:00:00 2001 From: LordGood Date: Wed, 19 Jun 2019 08:16:38 +0000 Subject: [PATCH] Teak, dragon bamboo, scaled down some baked normal and ao maps larger than the base map, minor edits to areca palm This was SVN commit r22392. --- .../art/actors/flora/trees/bamboo_dragon.xml | 21 ++++++++++++++ .../art/actors/flora/trees/palm_areca.xml | 10 ++++--- .../public/art/actors/flora/trees/teak.xml | 27 ++++++++++++++++++ .../art/actors/flora/trees/teak_leaves.xml | 28 +++++++++++++++++++ .../art/meshes/gaia/bamboo_dragon_1.dae | 3 ++ .../public/art/meshes/gaia/palm_areca_1.dae | 4 +-- .../public/art/meshes/gaia/palm_areca_2.dae | 4 +-- .../public/art/meshes/gaia/palm_areca_3.dae | 4 +-- .../public/art/meshes/gaia/palm_areca_4.dae | 4 +-- .../public/art/meshes/gaia/palm_areca_5.dae | 4 +-- .../public/art/meshes/gaia/tree_teak_1.dae | 3 ++ .../art/meshes/gaia/tree_teak_1_leaves.dae | 3 ++ .../public/art/meshes/gaia/tree_teak_2.dae | 3 ++ .../art/meshes/gaia/tree_teak_2_leaves.dae | 3 ++ .../art/textures/skins/gaia/bamboo_dragon.png | 3 ++ .../textures/skins/gaia/palm_areca_norm.png | 3 ++ .../textures/skins/gaia/palm_areca_spec.png | 3 ++ .../textures/skins/gaia/palm_palmyra_norm.png | 4 +-- .../textures/skins/gaia/stone_quarried_AO.png | 4 +-- .../skins/gaia/stone_quarried_norm.png | 4 +-- .../skins/gaia/stone_weathered_cubic_norm.png | 4 +-- .../public/art/textures/skins/gaia/teak.png | 3 ++ .../art/textures/skins/gaia/teak_norm.png | 3 ++ .../art/textures/skins/gaia/teak_spec.png | 3 ++ .../art/textures/skins/gaia/teak_trunk.png | 3 ++ .../textures/skins/gaia/teak_trunk_norm.png | 3 ++ .../textures/skins/gaia/teak_trunk_spec.png | 3 ++ .../gaia/flora_tree_bamboo_dragon.xml | 28 +++++++++++++++++++ .../templates/gaia/flora_tree_teak.xml | 27 ++++++++++++++++++ 29 files changed, 197 insertions(+), 22 deletions(-) create mode 100644 binaries/data/mods/public/art/actors/flora/trees/bamboo_dragon.xml create mode 100644 binaries/data/mods/public/art/actors/flora/trees/teak.xml create mode 100644 binaries/data/mods/public/art/actors/flora/trees/teak_leaves.xml create mode 100644 binaries/data/mods/public/art/meshes/gaia/bamboo_dragon_1.dae create mode 100644 binaries/data/mods/public/art/meshes/gaia/tree_teak_1.dae create mode 100644 binaries/data/mods/public/art/meshes/gaia/tree_teak_1_leaves.dae create mode 100644 binaries/data/mods/public/art/meshes/gaia/tree_teak_2.dae create mode 100644 binaries/data/mods/public/art/meshes/gaia/tree_teak_2_leaves.dae create mode 100644 binaries/data/mods/public/art/textures/skins/gaia/bamboo_dragon.png create mode 100644 binaries/data/mods/public/art/textures/skins/gaia/palm_areca_norm.png create mode 100644 binaries/data/mods/public/art/textures/skins/gaia/palm_areca_spec.png create mode 100644 binaries/data/mods/public/art/textures/skins/gaia/teak.png create mode 100644 binaries/data/mods/public/art/textures/skins/gaia/teak_norm.png create mode 100644 binaries/data/mods/public/art/textures/skins/gaia/teak_spec.png create mode 100644 binaries/data/mods/public/art/textures/skins/gaia/teak_trunk.png create mode 100644 binaries/data/mods/public/art/textures/skins/gaia/teak_trunk_norm.png create mode 100644 binaries/data/mods/public/art/textures/skins/gaia/teak_trunk_spec.png create mode 100644 binaries/data/mods/public/simulation/templates/gaia/flora_tree_bamboo_dragon.xml create mode 100644 binaries/data/mods/public/simulation/templates/gaia/flora_tree_teak.xml diff --git a/binaries/data/mods/public/art/actors/flora/trees/bamboo_dragon.xml b/binaries/data/mods/public/art/actors/flora/trees/bamboo_dragon.xml new file mode 100644 index 0000000000..cfee9079bb --- /dev/null +++ b/binaries/data/mods/public/art/actors/flora/trees/bamboo_dragon.xml @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + gaia/bamboo_dragon_1.dae + + + basic_trans_wind.xml + diff --git a/binaries/data/mods/public/art/actors/flora/trees/palm_areca.xml b/binaries/data/mods/public/art/actors/flora/trees/palm_areca.xml index ad302255e9..a7213f2f46 100644 --- a/binaries/data/mods/public/art/actors/flora/trees/palm_areca.xml +++ b/binaries/data/mods/public/art/actors/flora/trees/palm_areca.xml @@ -9,6 +9,8 @@ + + @@ -16,18 +18,18 @@ gaia/palm_areca_1.dae - + gaia/palm_areca_2.dae - + gaia/palm_areca_3.dae - + gaia/palm_areca_4.dae gaia/palm_areca_5.dae - basic_trans_wind.xml + basic_trans_spec.xml diff --git a/binaries/data/mods/public/art/actors/flora/trees/teak.xml b/binaries/data/mods/public/art/actors/flora/trees/teak.xml new file mode 100644 index 0000000000..b0cf432312 --- /dev/null +++ b/binaries/data/mods/public/art/actors/flora/trees/teak.xml @@ -0,0 +1,27 @@ + + + + + + + + + + + + + + + + + + + + gaia/tree_teak_1.dae + + + gaia/tree_teak_2.dae + + + trans_wind_parallax_spec.xml + diff --git a/binaries/data/mods/public/art/actors/flora/trees/teak_leaves.xml b/binaries/data/mods/public/art/actors/flora/trees/teak_leaves.xml new file mode 100644 index 0000000000..a0e86571d4 --- /dev/null +++ b/binaries/data/mods/public/art/actors/flora/trees/teak_leaves.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + gaia/tree_teak_1_leaves.dae + + + gaia/tree_teak_2_leaves.dae + + + trans_wind_parallax_spec.xml + diff --git a/binaries/data/mods/public/art/meshes/gaia/bamboo_dragon_1.dae b/binaries/data/mods/public/art/meshes/gaia/bamboo_dragon_1.dae new file mode 100644 index 0000000000..0886c87b3c --- /dev/null +++ b/binaries/data/mods/public/art/meshes/gaia/bamboo_dragon_1.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c09e110b392291ee6926c06d846f37ed4ab1e0b89db76e81dcc94441804ad003 +size 86808 diff --git a/binaries/data/mods/public/art/meshes/gaia/palm_areca_1.dae b/binaries/data/mods/public/art/meshes/gaia/palm_areca_1.dae index 9847abeaf7..fa5f16ef21 100644 --- a/binaries/data/mods/public/art/meshes/gaia/palm_areca_1.dae +++ b/binaries/data/mods/public/art/meshes/gaia/palm_areca_1.dae @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cdaeb391486fd8448284392bd06d50500e7b697cf840b3ce40815f3f857b1b19 -size 26580 +oid sha256:c3034e217b3435b5e998c743755ff4760abbade94959370407c1962a98a6620e +size 22501 diff --git a/binaries/data/mods/public/art/meshes/gaia/palm_areca_2.dae b/binaries/data/mods/public/art/meshes/gaia/palm_areca_2.dae index 0565b51132..6ecfe1f1bc 100644 --- a/binaries/data/mods/public/art/meshes/gaia/palm_areca_2.dae +++ b/binaries/data/mods/public/art/meshes/gaia/palm_areca_2.dae @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f7c17dfb969ce50070ed6fe78c055fc11cec532c762e439b2378ff312e3662e7 -size 29161 +oid sha256:096b2347a7048187ae163a54c41655d3e327373ae17f2cd3c68a0b326e5758fc +size 26316 diff --git a/binaries/data/mods/public/art/meshes/gaia/palm_areca_3.dae b/binaries/data/mods/public/art/meshes/gaia/palm_areca_3.dae index 7dafe7c1f5..00e81978dd 100644 --- a/binaries/data/mods/public/art/meshes/gaia/palm_areca_3.dae +++ b/binaries/data/mods/public/art/meshes/gaia/palm_areca_3.dae @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f954707285d02b83b4e439bff60fe88d8e83900a4eab7d869624abf84d6fe262 -size 23988 +oid sha256:2e82595a62b976c256015af2f203e2e8e21af264a86aea097ff2a996fc295e3d +size 23709 diff --git a/binaries/data/mods/public/art/meshes/gaia/palm_areca_4.dae b/binaries/data/mods/public/art/meshes/gaia/palm_areca_4.dae index 34d5eb5a00..34e55a0ddb 100644 --- a/binaries/data/mods/public/art/meshes/gaia/palm_areca_4.dae +++ b/binaries/data/mods/public/art/meshes/gaia/palm_areca_4.dae @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6dbe1312073391802c12a674422e3789cc6b869239ba32c76736072ca712f5d2 -size 22630 +oid sha256:d8d0cd161d807c4f745a440b957b33dff17efce5bfc0bee2ce78f1d45a665f34 +size 29276 diff --git a/binaries/data/mods/public/art/meshes/gaia/palm_areca_5.dae b/binaries/data/mods/public/art/meshes/gaia/palm_areca_5.dae index 3e3a299a10..51f86073c7 100644 --- a/binaries/data/mods/public/art/meshes/gaia/palm_areca_5.dae +++ b/binaries/data/mods/public/art/meshes/gaia/palm_areca_5.dae @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6ef1dccab05368381ecf5ef4e5a16630a86ed48a17dbab84e197db855e91b7f2 -size 29279 +oid sha256:a2f0a98c8e625fd79c4d0cffe9cc5fc883d7398a975903154d00bb0ac91869e5 +size 28928 diff --git a/binaries/data/mods/public/art/meshes/gaia/tree_teak_1.dae b/binaries/data/mods/public/art/meshes/gaia/tree_teak_1.dae new file mode 100644 index 0000000000..e0c4815f92 --- /dev/null +++ b/binaries/data/mods/public/art/meshes/gaia/tree_teak_1.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:69895b4ba13560493c1f9d1ee05cb60eab05352632fc3052c8a1957719c5ee65 +size 21218 diff --git a/binaries/data/mods/public/art/meshes/gaia/tree_teak_1_leaves.dae b/binaries/data/mods/public/art/meshes/gaia/tree_teak_1_leaves.dae new file mode 100644 index 0000000000..9544019e1a --- /dev/null +++ b/binaries/data/mods/public/art/meshes/gaia/tree_teak_1_leaves.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9921ff65dd9daa586276794c632ff9aa2dce31f125b379d266620ae0ac45ba1e +size 14712 diff --git a/binaries/data/mods/public/art/meshes/gaia/tree_teak_2.dae b/binaries/data/mods/public/art/meshes/gaia/tree_teak_2.dae new file mode 100644 index 0000000000..bc8459a396 --- /dev/null +++ b/binaries/data/mods/public/art/meshes/gaia/tree_teak_2.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:51d17a16984dd3039345a24930c9a4f51c5274b42080d912599f03e42e557bb9 +size 24792 diff --git a/binaries/data/mods/public/art/meshes/gaia/tree_teak_2_leaves.dae b/binaries/data/mods/public/art/meshes/gaia/tree_teak_2_leaves.dae new file mode 100644 index 0000000000..50fcc82f75 --- /dev/null +++ b/binaries/data/mods/public/art/meshes/gaia/tree_teak_2_leaves.dae @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d5eccaddd92dbe0a49b0fd7d46e6eea615537c18625726792a4a422837368178 +size 9576 diff --git a/binaries/data/mods/public/art/textures/skins/gaia/bamboo_dragon.png b/binaries/data/mods/public/art/textures/skins/gaia/bamboo_dragon.png new file mode 100644 index 0000000000..f87ccd1b68 --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/gaia/bamboo_dragon.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:04423c30513d405bc6c59b54846705a38677eebfe540c42065020dba5a699a00 +size 1191535 diff --git a/binaries/data/mods/public/art/textures/skins/gaia/palm_areca_norm.png b/binaries/data/mods/public/art/textures/skins/gaia/palm_areca_norm.png new file mode 100644 index 0000000000..529403e07a --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/gaia/palm_areca_norm.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1931f11648cbe15888721c56e730fb991883557450a4c2b5cc0fa4fb89981625 +size 449151 diff --git a/binaries/data/mods/public/art/textures/skins/gaia/palm_areca_spec.png b/binaries/data/mods/public/art/textures/skins/gaia/palm_areca_spec.png new file mode 100644 index 0000000000..cc2d9d62d0 --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/gaia/palm_areca_spec.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3ccb2e4c3f9752adaeeae4d3702c1ef3173e28e6b935484bac865251122866df +size 145270 diff --git a/binaries/data/mods/public/art/textures/skins/gaia/palm_palmyra_norm.png b/binaries/data/mods/public/art/textures/skins/gaia/palm_palmyra_norm.png index e85b2af132..5330566d3e 100644 --- a/binaries/data/mods/public/art/textures/skins/gaia/palm_palmyra_norm.png +++ b/binaries/data/mods/public/art/textures/skins/gaia/palm_palmyra_norm.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ae3225485a06ca4537cec16b07e72d9a54c0de1917e2629c85f1cd65b5f14a63 -size 1256471 +oid sha256:32ab4205ef33286c42496f7637cdb99c5ad3cb49ad7609512f3b9bde2dc7a2a3 +size 388995 diff --git a/binaries/data/mods/public/art/textures/skins/gaia/stone_quarried_AO.png b/binaries/data/mods/public/art/textures/skins/gaia/stone_quarried_AO.png index f0df597927..5e1083e82d 100644 --- a/binaries/data/mods/public/art/textures/skins/gaia/stone_quarried_AO.png +++ b/binaries/data/mods/public/art/textures/skins/gaia/stone_quarried_AO.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d29864d817b18754c0d9c664af60786051ddc24707c16ac2fb0e6d9697c602a -size 284128 +oid sha256:3936ed76e6ff486325c485e7c4c7c980bc18d68c9c2054db4c6647c48583d795 +size 60886 diff --git a/binaries/data/mods/public/art/textures/skins/gaia/stone_quarried_norm.png b/binaries/data/mods/public/art/textures/skins/gaia/stone_quarried_norm.png index 22a95c7915..6c776fde9a 100644 --- a/binaries/data/mods/public/art/textures/skins/gaia/stone_quarried_norm.png +++ b/binaries/data/mods/public/art/textures/skins/gaia/stone_quarried_norm.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8d96f973dfaf318723b7a9b6054f0bcca090b3feed882f519b96c7ad25994fd3 -size 972080 +oid sha256:674e3290d7ebf305322b9218be894d882bf356ad7f5b75a12feb2b5ba7acc987 +size 272678 diff --git a/binaries/data/mods/public/art/textures/skins/gaia/stone_weathered_cubic_norm.png b/binaries/data/mods/public/art/textures/skins/gaia/stone_weathered_cubic_norm.png index c8226857dd..7fa838c770 100644 --- a/binaries/data/mods/public/art/textures/skins/gaia/stone_weathered_cubic_norm.png +++ b/binaries/data/mods/public/art/textures/skins/gaia/stone_weathered_cubic_norm.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fec6848b5c570da349244e966d5af577948a63f5595fb5a4b2a0eacfc5103bfb -size 1190579 +oid sha256:7125a54341fe1ac74b7245621635216a2a7418752768d2c895f368e28a58f87e +size 326024 diff --git a/binaries/data/mods/public/art/textures/skins/gaia/teak.png b/binaries/data/mods/public/art/textures/skins/gaia/teak.png new file mode 100644 index 0000000000..c752db1542 --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/gaia/teak.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f6da48a727b954354d066fa03a012543a77eebfa488515be6648a983ac03f337 +size 1231792 diff --git a/binaries/data/mods/public/art/textures/skins/gaia/teak_norm.png b/binaries/data/mods/public/art/textures/skins/gaia/teak_norm.png new file mode 100644 index 0000000000..78dafd1447 --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/gaia/teak_norm.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:30ae6fe5b9c12146af84b3e07922f0bd1e619593821cb44c012efd4a5a4139ad +size 628802 diff --git a/binaries/data/mods/public/art/textures/skins/gaia/teak_spec.png b/binaries/data/mods/public/art/textures/skins/gaia/teak_spec.png new file mode 100644 index 0000000000..ad74fb571c --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/gaia/teak_spec.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:691aba773128b92fae75a47b8160bc72e42d90eb6306aa26f1899a093ed1a1ad +size 339343 diff --git a/binaries/data/mods/public/art/textures/skins/gaia/teak_trunk.png b/binaries/data/mods/public/art/textures/skins/gaia/teak_trunk.png new file mode 100644 index 0000000000..41e11df0fb --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/gaia/teak_trunk.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4aca26dc038005220cbdd2f223b882a6d9d3db56f9d6ea580ed9d275781e730f +size 916224 diff --git a/binaries/data/mods/public/art/textures/skins/gaia/teak_trunk_norm.png b/binaries/data/mods/public/art/textures/skins/gaia/teak_trunk_norm.png new file mode 100644 index 0000000000..262a88b7f2 --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/gaia/teak_trunk_norm.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a521c7a4e1c6918e6f3d9d56976a54507146269f093666a4c8d9cda4d9b43cd7 +size 471315 diff --git a/binaries/data/mods/public/art/textures/skins/gaia/teak_trunk_spec.png b/binaries/data/mods/public/art/textures/skins/gaia/teak_trunk_spec.png new file mode 100644 index 0000000000..779de4ab0f --- /dev/null +++ b/binaries/data/mods/public/art/textures/skins/gaia/teak_trunk_spec.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:57b72efaed631a4aa12cc0c8308d18364005d8349ca4e61849e38b2c6b10e239 +size 522551 diff --git a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_bamboo_dragon.xml b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_bamboo_dragon.xml new file mode 100644 index 0000000000..922bf57c74 --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_bamboo_dragon.xml @@ -0,0 +1,28 @@ + + + + + 15.0 + + + Dragon Bamboo + + + + + + 1000 + 12 + + + + + circle/256x256.png + circle/256x256_mask.png + + + + + flora/trees/bamboo_dragon.xml + + diff --git a/binaries/data/mods/public/simulation/templates/gaia/flora_tree_teak.xml b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_teak.xml new file mode 100644 index 0000000000..3c2794c1ec --- /dev/null +++ b/binaries/data/mods/public/simulation/templates/gaia/flora_tree_teak.xml @@ -0,0 +1,27 @@ + + + + + 15.0 + + + Teak + + + + + + 500 + + + + + circle/256x256.png + circle/256x256_mask.png + + + + + flora/trees/teak.xml + +