diff options
Diffstat (limited to '')
| -rw-r--r-- | linden/indra/newview/app_settings/grass.xml | 6 | ||||
| -rw-r--r-- | linden/indra/newview/app_settings/trees.xml | 42 | ||||
| -rw-r--r-- | linden/indra/newview/llvograss.cpp | 16 | ||||
| -rw-r--r-- | linden/indra/newview/llvotree.cpp | 7 | ||||
| -rw-r--r-- | linden/indra/newview/llvotree.h | 1 |
5 files changed, 39 insertions, 33 deletions
diff --git a/linden/indra/newview/app_settings/grass.xml b/linden/indra/newview/app_settings/grass.xml index bdfa603..6ae2ed5 100644 --- a/linden/indra/newview/app_settings/grass.xml +++ b/linden/indra/newview/app_settings/grass.xml | |||
| @@ -4,6 +4,7 @@ | |||
| 4 | <grass | 4 | <grass |
| 5 | name="Grass - Medium" | 5 | name="Grass - Medium" |
| 6 | species_id="0" | 6 | species_id="0" |
| 7 | texture_name="6c4727b8-ac79-ba44-3b81-f9aa887b47eb.j2c" | ||
| 7 | texture_id="6c4727b8-ac79-ba44-3b81-f9aa887b47eb" | 8 | texture_id="6c4727b8-ac79-ba44-3b81-f9aa887b47eb" |
| 8 | blade_size_x="1.35" | 9 | blade_size_x="1.35" |
| 9 | blade_size_y="1.35" | 10 | blade_size_y="1.35" |
| @@ -11,6 +12,7 @@ | |||
| 11 | <grass | 12 | <grass |
| 12 | name="Grass - Short 2" | 13 | name="Grass - Short 2" |
| 13 | species_id="1" | 14 | species_id="1" |
| 15 | texture_name="79504bf5-c3ec-0763-6563-d843de66d0a1.j2c" | ||
| 14 | texture_id="79504bf5-c3ec-0763-6563-d843de66d0a1" | 16 | texture_id="79504bf5-c3ec-0763-6563-d843de66d0a1" |
| 15 | blade_size_x="1.0" | 17 | blade_size_x="1.0" |
| 16 | blade_size_y="0.66" | 18 | blade_size_y="0.66" |
| @@ -18,6 +20,7 @@ | |||
| 18 | <grass | 20 | <grass |
| 19 | name="Grass - Tall Green" | 21 | name="Grass - Tall Green" |
| 20 | species_id="2" | 22 | species_id="2" |
| 23 | texture_name="6c4727b8-ac79-ba44-3b81-f9aa887b47eb.j2c" | ||
| 21 | texture_id="6c4727b8-ac79-ba44-3b81-f9aa887b47eb" | 24 | texture_id="6c4727b8-ac79-ba44-3b81-f9aa887b47eb" |
| 22 | blade_size_x="1.8" | 25 | blade_size_x="1.8" |
| 23 | blade_size_y="1.8" | 26 | blade_size_y="1.8" |
| @@ -25,6 +28,7 @@ | |||
| 25 | <grass | 28 | <grass |
| 26 | name="Grass - Short 1" | 29 | name="Grass - Short 1" |
| 27 | species_id="3" | 30 | species_id="3" |
| 31 | texture_name="99bd60a2-3250-efc9-2e39-2fbcadefbecc.j2c" | ||
| 28 | texture_id="99bd60a2-3250-efc9-2e39-2fbcadefbecc" | 32 | texture_id="99bd60a2-3250-efc9-2e39-2fbcadefbecc" |
| 29 | blade_size_x="1.0" | 33 | blade_size_x="1.0" |
| 30 | blade_size_y="1.0" | 34 | blade_size_y="1.0" |
| @@ -32,6 +36,7 @@ | |||
| 32 | <grass | 36 | <grass |
| 33 | name="Grass - Tall Brown" | 37 | name="Grass - Tall Brown" |
| 34 | species_id="4" | 38 | species_id="4" |
| 39 | texture_name="7a2b3a4a-53c2-53ac-5716-aac7d743c020.j2c" | ||
| 35 | texture_id="7a2b3a4a-53c2-53ac-5716-aac7d743c020" | 40 | texture_id="7a2b3a4a-53c2-53ac-5716-aac7d743c020" |
| 36 | blade_size_x="2.25" | 41 | blade_size_x="2.25" |
| 37 | blade_size_y="2.25" | 42 | blade_size_y="2.25" |
| @@ -39,6 +44,7 @@ | |||
| 39 | <grass | 44 | <grass |
| 40 | name="Leafy Ground Cover" | 45 | name="Leafy Ground Cover" |
| 41 | species_id="5" | 46 | species_id="5" |
| 47 | texture_name="8f458549-173b-23ff-d4ff-bfaa5ea2371b.j2c" | ||
| 42 | texture_id="8f458549-173b-23ff-d4ff-bfaa5ea2371b" | 48 | texture_id="8f458549-173b-23ff-d4ff-bfaa5ea2371b" |
| 43 | blade_size_x="2.0" | 49 | blade_size_x="2.0" |
| 44 | blade_size_y="2.0" | 50 | blade_size_y="2.0" |
diff --git a/linden/indra/newview/app_settings/trees.xml b/linden/indra/newview/app_settings/trees.xml index 36ffa62..9f34708 100644 --- a/linden/indra/newview/app_settings/trees.xml +++ b/linden/indra/newview/app_settings/trees.xml | |||
| @@ -1,24 +1,24 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8" standalone="yes"?> | 1 | <?xml version="1.0" encoding="utf-8" standalone="yes"?> |
| 2 | <tree_defs> | 2 | <tree_defs> |
| 3 | <tree name="Pine Tree - Ponderosa" species_id="0" texture_id="0187babf-6c0d-5891-ebed-4ecab1426683" droop="60.0" twist="5.0" branches="5.0" depth="1" scale_step="0.7" trunk_depth="6" branch_length="8.0" trunk_length="11.5" leaf_scale="22.0" billboard_scale="39.5" billboard_ratio="1.1" trunk_aspect="0.1" branch_aspect="0.05" leaf_rotate="20.0" noise_mag="0.5" noise_scale="2.5" taper="0.8" repeat_z="3" /> | 3 | <tree name="Pine Tree - Ponderosa" species_id="0" texture_id="0187babf-6c0d-5891-ebed-4ecab1426683" texture_name="0187babf-6c0d-5891-ebed-4ecab1426683.j2c" droop="60.0" twist="5.0" branches="5.0" depth="1" scale_step="0.7" trunk_depth="6" branch_length="8.0" trunk_length="11.5" leaf_scale="22.0" billboard_scale="39.5" billboard_ratio="1.1" trunk_aspect="0.1" branch_aspect="0.05" leaf_rotate="20.0" noise_mag="0.5" noise_scale="2.5" taper="0.8" repeat_z="3" /> |
| 4 | <tree name="Oak" species_id="1" texture_id="8a515889-eac9-fb55-8eba-d2dc09eb32c8" droop="35.0" twist="3.0" branches="4.0" depth="3" scale_step="0.7" trunk_depth="0" branch_length="3.0" trunk_length="3.8" leaf_scale="7.0" billboard_scale="10.25" billboard_ratio="1.0" trunk_aspect="0.15" branch_aspect="0.07" leaf_rotate="0.0" noise_mag="1.2" noise_scale="4.0" taper="0.3" repeat_z="4" /> | 4 | <tree name="Oak" species_id="1" texture_id="8a515889-eac9-fb55-8eba-d2dc09eb32c8" texture_name="8a515889-eac9-fb55-8eba-d2dc09eb32c8.j2c" droop="35.0" twist="3.0" branches="4.0" depth="3" scale_step="0.7" trunk_depth="0" branch_length="3.0" trunk_length="3.8" leaf_scale="7.0" billboard_scale="10.25" billboard_ratio="1.0" trunk_aspect="0.15" branch_aspect="0.07" leaf_rotate="0.0" noise_mag="1.2" noise_scale="4.0" taper="0.3" repeat_z="4" /> |
| 5 | <tree name="Tropical Plant 1" species_id="2" texture_id="5bc11cd6-2f40-071e-a8da-0903394204f9" droop="10.0" twist="0.0" branches="6.0" depth="1" scale_step="0.5" trunk_depth="1" branch_length="0.5" trunk_length="0.15" leaf_scale="7.5" billboard_scale="5.0" billboard_ratio="1.25" trunk_aspect="1.0" branch_aspect="0.08" leaf_rotate="0.0" noise_mag="1.0" noise_scale="1.0" taper="0.2" repeat_z="1" /> | 5 | <tree name="Tropical Plant 1" species_id="2" texture_id="5bc11cd6-2f40-071e-a8da-0903394204f9" texture_name="5bc11cd6-2f40-071e-a8da-0903394204f9.j2c" droop="10.0" twist="0.0" branches="6.0" depth="1" scale_step="0.5" trunk_depth="1" branch_length="0.5" trunk_length="0.15" leaf_scale="7.5" billboard_scale="5.0" billboard_ratio="1.25" trunk_aspect="1.0" branch_aspect="0.08" leaf_rotate="0.0" noise_mag="1.0" noise_scale="1.0" taper="0.2" repeat_z="1" /> |
| 6 | <tree name="Palm Tree 1" species_id="3" texture_id="ca4e8c27-473c-eb1c-2f5d-50ee3f07d85c" droop="0.0" twist="0.0" branches="3.0" depth="1" scale_step="0.5" trunk_depth="0" branch_length="0.7" trunk_length="9.0" leaf_scale="10.0" billboard_scale="13.25" billboard_ratio="1.0" trunk_aspect="0.035" branch_aspect="0.03" leaf_rotate="0.0" noise_mag="0.2" noise_scale="6.0" taper="0.7" repeat_z="10" /> | 6 | <tree name="Palm Tree 1" species_id="3" texture_id="ca4e8c27-473c-eb1c-2f5d-50ee3f07d85c" texture_name="ca4e8c27-473c-eb1c-2f5d-50ee3f07d85c.j2c" droop="0.0" twist="0.0" branches="3.0" depth="1" scale_step="0.5" trunk_depth="0" branch_length="0.7" trunk_length="9.0" leaf_scale="10.0" billboard_scale="13.25" billboard_ratio="1.0" trunk_aspect="0.035" branch_aspect="0.03" leaf_rotate="0.0" noise_mag="0.2" noise_scale="6.0" taper="0.7" repeat_z="10" /> |
| 7 | <tree name="Dogwood Tree" species_id="4" texture_id="64367bd1-697e-b3e6-0b65-3f862a577366" droop="30.0" twist="0.0" branches="3.0" depth="2" scale_step="0.7" trunk_depth="1" branch_length="2.75" trunk_length="4.0" leaf_scale="5.5" billboard_scale="10.0" billboard_ratio="1.0" trunk_aspect="0.06" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="1.5" noise_scale="2.0" taper="0.8" repeat_z="3" /> | 7 | <tree name="Dogwood Tree" species_id="4" texture_id="64367bd1-697e-b3e6-0b65-3f862a577366" texture_name="64367bd1-697e-b3e6-0b65-3f862a577366.j2c" droop="30.0" twist="0.0" branches="3.0" depth="2" scale_step="0.7" trunk_depth="1" branch_length="2.75" trunk_length="4.0" leaf_scale="5.5" billboard_scale="10.0" billboard_ratio="1.0" trunk_aspect="0.06" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="1.5" noise_scale="2.0" taper="0.8" repeat_z="3" /> |
| 8 | <tree name="Tropical Plant 2" species_id="5" texture_id="cdd9a9fc-6d0b-f90d-8416-c72b6019bca8" droop="10.0" twist="0.0" branches="3.0" depth="1" scale_step="0.5" trunk_depth="1" branch_length="0.5" trunk_length="0.15" leaf_scale="6.0" billboard_scale="4.5" billboard_ratio="0.9" trunk_aspect="1.0" branch_aspect="0.08" leaf_rotate="0.0" noise_mag="1.0" noise_scale="1.0" taper="0.2" repeat_z="1" /> | 8 | <tree name="Tropical Plant 2" species_id="5" texture_id="cdd9a9fc-6d0b-f90d-8416-c72b6019bca8" texture_name="cdd9a9fc-6d0b-f90d-8416-c72b6019bca8.j2c" droop="10.0" twist="0.0" branches="3.0" depth="1" scale_step="0.5" trunk_depth="1" branch_length="0.5" trunk_length="0.15" leaf_scale="6.0" billboard_scale="4.5" billboard_ratio="0.9" trunk_aspect="1.0" branch_aspect="0.08" leaf_rotate="0.0" noise_mag="1.0" noise_scale="1.0" taper="0.2" repeat_z="1" /> |
| 9 | <tree name="Palm Tree 2" species_id="6" texture_id="2d784476-d0db-9979-0cff-9408745a7cf3" droop="0.0" twist="0.0" branches="3.0" depth="1" scale_step="0.5" trunk_depth="0" branch_length="0.7" trunk_length="10.0" leaf_scale="7.5" billboard_scale="13.5" billboard_ratio="1.0" trunk_aspect="0.035" branch_aspect="0.03" leaf_rotate="0.0" noise_mag="0.2" noise_scale="6.0" taper="0.6" repeat_z="12" /> | 9 | <tree name="Palm Tree 2" species_id="6" texture_id="2d784476-d0db-9979-0cff-9408745a7cf3" texture_name="2d784476-d0db-9979-0cff-9408745a7cf3.j2c" droop="0.0" twist="0.0" branches="3.0" depth="1" scale_step="0.5" trunk_depth="0" branch_length="0.7" trunk_length="10.0" leaf_scale="7.5" billboard_scale="13.5" billboard_ratio="1.0" trunk_aspect="0.035" branch_aspect="0.03" leaf_rotate="0.0" noise_mag="0.2" noise_scale="6.0" taper="0.6" repeat_z="12" /> |
| 10 | <tree name="Cypress Tree 1" species_id="7" texture_id="fb2ae204-3fd1-df33-594f-c9f882830e66" droop="30.0" twist="0.0" branches="3.0" depth="4" scale_step="0.5" trunk_depth="0" branch_length="10.0" trunk_length="10.0" leaf_scale="70.0" billboard_scale="22.5" billboard_ratio="1.0" trunk_aspect="0.05" branch_aspect="0.03" leaf_rotate="0.0" noise_mag="1.2" noise_scale="1.0" taper="0.5" repeat_z="6" /> | 10 | <tree name="Cypress Tree 1" species_id="7" texture_id="fb2ae204-3fd1-df33-594f-c9f882830e66" texture_name="fb2ae204-3fd1-df33-594f-c9f882830e66.j2c" droop="30.0" twist="0.0" branches="3.0" depth="4" scale_step="0.5" trunk_depth="0" branch_length="10.0" trunk_length="10.0" leaf_scale="70.0" billboard_scale="22.5" billboard_ratio="1.0" trunk_aspect="0.05" branch_aspect="0.03" leaf_rotate="0.0" noise_mag="1.2" noise_scale="1.0" taper="0.5" repeat_z="6" /> |
| 11 | <tree name="Cypress Tree 2" species_id="8" texture_id="30047cec-269d-408e-0c30-b2603b887268" droop="30.0" twist="0.0" branches="3.0" depth="4" scale_step="0.6" trunk_depth="3.0" branch_length="7.5" trunk_length="10.0" leaf_scale="35.0" billboard_scale="25.0" billboard_ratio="0.8" trunk_aspect="0.05" branch_aspect="0.04" leaf_rotate="0.0" noise_mag="1.2" noise_scale="1.0" taper="0.5" repeat_z="5" /> | 11 | <tree name="Cypress Tree 2" species_id="8" texture_id="30047cec-269d-408e-0c30-b2603b887268" texture_name="30047cec-269d-408e-0c30-b2603b887268.j2c" droop="30.0" twist="0.0" branches="3.0" depth="4" scale_step="0.6" trunk_depth="3.0" branch_length="7.5" trunk_length="10.0" leaf_scale="35.0" billboard_scale="25.0" billboard_ratio="0.8" trunk_aspect="0.05" branch_aspect="0.04" leaf_rotate="0.0" noise_mag="1.2" noise_scale="1.0" taper="0.5" repeat_z="5" /> |
| 12 | <tree name="Pine Tree - Evergreen" species_id="9" texture_id="d691a01c-13b7-578d-57c0-5caef0b4e7e1" droop="50.0" twist="7.5" branches="4.0" depth="2" scale_step="0.7" trunk_depth="6.0" branch_length="6.0" trunk_length="10.0" leaf_scale="15.5" billboard_scale="33.0" billboard_ratio="1.35" trunk_aspect="0.1" branch_aspect="0.08" leaf_rotate="5.0" noise_mag="0.5" noise_scale="2.5" taper="0.7" repeat_z="3" /> | 12 | <tree name="Pine Tree - Evergreen" species_id="9" texture_id="d691a01c-13b7-578d-57c0-5caef0b4e7e1" texture_name="d691a01c-13b7-578d-57c0-5caef0b4e7e1.j2c" droop="50.0" twist="7.5" branches="4.0" depth="2" scale_step="0.7" trunk_depth="6.0" branch_length="6.0" trunk_length="10.0" leaf_scale="15.5" billboard_scale="33.0" billboard_ratio="1.35" trunk_aspect="0.1" branch_aspect="0.08" leaf_rotate="5.0" noise_mag="0.5" noise_scale="2.5" taper="0.7" repeat_z="3" /> |
| 13 | <tree name="Plumeria" species_id="10" texture_id="6de37e4e-7029-61f5-54b8-f5e63f983f58" droop="8.0" twist="7.0" branches="3.0" depth="2" scale_step="0.6" trunk_depth="0" branch_length="3.0" trunk_length="0.1" leaf_scale="20" billboard_scale="10.0" billboard_ratio="1.35" trunk_aspect="0.10" branch_aspect="0.075" leaf_rotate="0.0" noise_mag="0" noise_scale="0" taper="0.85" repeat_z="2" /> | 13 | <tree name="Plumeria" species_id="10" texture_id="6de37e4e-7029-61f5-54b8-f5e63f983f58" texture_name="6de37e4e-7029-61f5-54b8-f5e63f983f58.j2c" droop="8.0" twist="7.0" branches="3.0" depth="2" scale_step="0.6" trunk_depth="0" branch_length="3.0" trunk_length="0.1" leaf_scale="20" billboard_scale="10.0" billboard_ratio="1.35" trunk_aspect="0.10" branch_aspect="0.075" leaf_rotate="0.0" noise_mag="0" noise_scale="0" taper="0.85" repeat_z="2" /> |
| 14 | <tree name="Winter Pine Tree 1" species_id="11" texture_id="10d2a01a-0818-84b9-4b96-c2eb63256519" droop="90.0" twist="2.5" branches="6.0" depth="1" scale_step="0.66" trunk_depth="8" branch_length="0.0" trunk_length="4" leaf_scale="6.75" billboard_scale="12.5" billboard_ratio="0.6" trunk_aspect="0.1" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="0.0" noise_scale="2.5" taper="0.85" repeat_z="2" /> | 14 | <tree name="Winter Pine Tree 1" species_id="11" texture_id="10d2a01a-0818-84b9-4b96-c2eb63256519" texture_name="10d2a01a-0818-84b9-4b96-c2eb63256519.j2c" droop="90.0" twist="2.5" branches="6.0" depth="1" scale_step="0.66" trunk_depth="8" branch_length="0.0" trunk_length="4" leaf_scale="6.75" billboard_scale="12.5" billboard_ratio="0.6" trunk_aspect="0.1" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="0.0" noise_scale="2.5" taper="0.85" repeat_z="2" /> |
| 15 | <tree name="Winter Aspen Tree" species_id="12" texture_id="7c0cf89b-44b1-1ce2-dd74-07102a98ac2a" droop="85.0" twist="3.0" branches="5" depth="1" scale_step="0.6" trunk_depth="8" branch_length="3.0" trunk_length="4.5" leaf_scale="8" billboard_scale="12" billboard_ratio=".675" trunk_aspect="0.06" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="0.75" noise_scale="2.5" taper="0.8" repeat_z="2" /> | 15 | <tree name="Winter Aspen Tree" species_id="12" texture_id="7c0cf89b-44b1-1ce2-dd74-07102a98ac2a" texture_name="7c0cf89b-44b1-1ce2-dd74-07102a98ac2a.j2c" droop="85.0" twist="3.0" branches="5" depth="1" scale_step="0.6" trunk_depth="8" branch_length="3.0" trunk_length="4.5" leaf_scale="8" billboard_scale="12" billboard_ratio=".675" trunk_aspect="0.06" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="0.75" noise_scale="2.5" taper="0.8" repeat_z="2" /> |
| 16 | <tree name="Winter Pine Tree 2" species_id="13" texture_id="67931331-0c02-4876-1255-28770896c6a2" droop="140.0" twist="5.0" branches="6.0" depth="1" scale_step="0.6" trunk_depth="7" branch_length="0.0" trunk_length="3" leaf_scale="5.0" billboard_scale="7.5" billboard_ratio="0.5" trunk_aspect="0.1" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="0.750" noise_scale="2.5" taper="0.5" repeat_z="2" /> | 16 | <tree name="Winter Pine Tree 2" species_id="13" texture_id="67931331-0c02-4876-1255-28770896c6a2" texture_name="67931331-0c02-4876-1255-28770896c6a2.j2c" droop="140.0" twist="5.0" branches="6.0" depth="1" scale_step="0.6" trunk_depth="7" branch_length="0.0" trunk_length="3" leaf_scale="5.0" billboard_scale="7.5" billboard_ratio="0.5" trunk_aspect="0.1" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="0.750" noise_scale="2.5" taper="0.5" repeat_z="2" /> |
| 17 | <tree name="Eucalyptus Tree" species_id="14" texture_id="a6162133-724b-54df-a12f-51cd070ad6f3" droop="20.0" twist="5.0" branches="3.6" depth="4" scale_step="0.6" trunk_depth="0" branch_length="12.0" trunk_length="8.0" leaf_scale="33.0" billboard_scale="24" billboard_ratio="1.3" trunk_aspect="0.15" branch_aspect="0.08" leaf_rotate="0.0" noise_mag="0" noise_scale="0" taper="0.675" repeat_z="3" /> | 17 | <tree name="Eucalyptus Tree" species_id="14" texture_id="a6162133-724b-54df-a12f-51cd070ad6f3" texture_name="a6162133-724b-54df-a12f-51cd070ad6f3.j2c" droop="20.0" twist="5.0" branches="3.6" depth="4" scale_step="0.6" trunk_depth="0" branch_length="12.0" trunk_length="8.0" leaf_scale="33.0" billboard_scale="24" billboard_ratio="1.3" trunk_aspect="0.15" branch_aspect="0.08" leaf_rotate="0.0" noise_mag="0" noise_scale="0" taper="0.675" repeat_z="3" /> |
| 18 | <tree name="Fern" species_id="15" texture_id="8872f2b8-31db-42d8-580a-b3e4a91262de" droop="12.0" twist="0.0" branches="7.0" depth="1" scale_step="0.5" trunk_depth="0.1" branch_length="0.01" trunk_length="0.0" leaf_scale="4" billboard_scale="3.5" billboard_ratio="0.85" trunk_aspect="1.0" branch_aspect="0.08" leaf_rotate="0.0" noise_mag="1.0" noise_scale="1.0" taper="0.2" repeat_z="1" /> | 18 | <tree name="Fern" species_id="15" texture_id="8872f2b8-31db-42d8-580a-b3e4a91262de" texture_name="8872f2b8-31db-42d8-580a-b3e4a91262de.j2c" droop="12.0" twist="0.0" branches="7.0" depth="1" scale_step="0.5" trunk_depth="0.1" branch_length="0.01" trunk_length="0.0" leaf_scale="4" billboard_scale="3.5" billboard_ratio="0.85" trunk_aspect="1.0" branch_aspect="0.08" leaf_rotate="0.0" noise_mag="1.0" noise_scale="1.0" taper="0.2" repeat_z="1" /> |
| 19 | <tree name="Eelgrass" species_id="16" texture_id="96b4de31-f4fa-337d-ec78-451e3609769e" droop="0.0" twist="0.0" branches="5.0" depth="1" scale_step="0.5" trunk_depth="1" branch_length="0.5" trunk_length="0.15" leaf_scale="5.0" billboard_scale="3.0" billboard_ratio="1.0" trunk_aspect="1.0" branch_aspect="0.08" leaf_rotate="0.0" noise_mag="1.0" noise_scale="1.0" taper="0.2" repeat_z="1" /> | 19 | <tree name="Eelgrass" species_id="16" texture_id="96b4de31-f4fa-337d-ec78-451e3609769e" texture_name="96b4de31-f4fa-337d-ec78-451e3609769e.j2c" droop="0.0" twist="0.0" branches="5.0" depth="1" scale_step="0.5" trunk_depth="1" branch_length="0.5" trunk_length="0.15" leaf_scale="5.0" billboard_scale="3.0" billboard_ratio="1.0" trunk_aspect="1.0" branch_aspect="0.08" leaf_rotate="0.0" noise_mag="1.0" noise_scale="1.0" taper="0.2" repeat_z="1" /> |
| 20 | <tree name="Sea Sword" species_id="17" texture_id="5894e2e7-ab8d-edfa-e61c-18cf16854ba3" droop="0.0" twist="0.0" branches="6.0" depth="1" scale_step="0.7" trunk_depth="1" branch_length="0.0" trunk_length="0.0" leaf_scale="2.0" billboard_scale="2.0" billboard_ratio="1.0" trunk_aspect="1.0" branch_aspect="1.0" leaf_rotate="0.0" noise_mag="0.5" noise_scale="0.0" taper="0.0" repeat_z="1" /> | 20 | <tree name="Sea Sword" species_id="17" texture_id="5894e2e7-ab8d-edfa-e61c-18cf16854ba3" texture_name="5894e2e7-ab8d-edfa-e61c-18cf16854ba3.j2c" droop="0.0" twist="0.0" branches="6.0" depth="1" scale_step="0.7" trunk_depth="1" branch_length="0.0" trunk_length="0.0" leaf_scale="2.0" billboard_scale="2.0" billboard_ratio="1.0" trunk_aspect="1.0" branch_aspect="1.0" leaf_rotate="0.0" noise_mag="0.5" noise_scale="0.0" taper="0.0" repeat_z="1" /> |
| 21 | <tree name="Kelp (brown)" species_id="18" texture_id="2caf1179-7861-6ff3-4b7d-46e17780bdfa" droop="-15.0" twist="0.0" branches="1.0" depth="1" scale_step="1.0" trunk_depth="3" branch_length="2.5" trunk_length="0.75" leaf_scale="1.85" billboard_scale="4.9" billboard_ratio="1.0" trunk_aspect="0.04" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="1.0" noise_scale="2.0" taper="0.8" repeat_z="2" /> | 21 | <tree name="Kelp (brown)" species_id="18" texture_id="2caf1179-7861-6ff3-4b7d-46e17780bdfa" texture_name="2caf1179-7861-6ff3-4b7d-46e17780bdfa.j2c" droop="-15.0" twist="0.0" branches="1.0" depth="1" scale_step="1.0" trunk_depth="3" branch_length="2.5" trunk_length="0.75" leaf_scale="1.85" billboard_scale="4.9" billboard_ratio="1.0" trunk_aspect="0.04" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="1.0" noise_scale="2.0" taper="0.8" repeat_z="2" /> |
| 22 | <tree name="Beach Grass" species_id="19" texture_id="18fb888b-e8f1-dce7-7da7-321d651ea6b0" droop="0.0" twist="0.0" branches="4.0" depth="1" scale_step="0.7" trunk_depth="1" branch_length="0.0" trunk_length="0.0" leaf_scale="4.0" billboard_scale="2.5" billboard_ratio="1.2" trunk_aspect="1.0" branch_aspect="1.0" leaf_rotate="0.0" noise_mag="0.5" noise_scale="0.0" taper="0.0" repeat_z="1" /> | 22 | <tree name="Beach Grass" species_id="19" texture_id="18fb888b-e8f1-dce7-7da7-321d651ea6b0" texture_name="18fb888b-e8f1-dce7-7da7-321d651ea6b0.j2c" droop="0.0" twist="0.0" branches="4.0" depth="1" scale_step="0.7" trunk_depth="1" branch_length="0.0" trunk_length="0.0" leaf_scale="4.0" billboard_scale="2.5" billboard_ratio="1.2" trunk_aspect="1.0" branch_aspect="1.0" leaf_rotate="0.0" noise_mag="0.5" noise_scale="0.0" taper="0.0" repeat_z="1" /> |
| 23 | <tree name="Kelp (green)" species_id="20" texture_id="2a4880b6-b7a3-690a-2049-bfbe38eafb9f" droop="-15.0" twist="0.0" branches="1.0" depth="1" scale_step="1.0" trunk_depth="3" branch_length="2.5" trunk_length="1.35" leaf_scale="2.0" billboard_scale="4.9" billboard_ratio="1.0" trunk_aspect="0.025" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="1.0" noise_scale="2.0" taper="0.8" repeat_z="2" /> | 23 | <tree name="Kelp (green)" species_id="20" texture_id="2a4880b6-b7a3-690a-2049-bfbe38eafb9f" texture_name="2a4880b6-b7a3-690a-2049-bfbe38eafb9f.j2c" droop="-15.0" twist="0.0" branches="1.0" depth="1" scale_step="1.0" trunk_depth="3" branch_length="2.5" trunk_length="1.35" leaf_scale="2.0" billboard_scale="4.9" billboard_ratio="1.0" trunk_aspect="0.025" branch_aspect="0.05" leaf_rotate="0.0" noise_mag="1.0" noise_scale="2.0" taper="0.8" repeat_z="2" /> |
| 24 | </tree_defs> | 24 | </tree_defs> |
diff --git a/linden/indra/newview/llvograss.cpp b/linden/indra/newview/llvograss.cpp index d0a36b0..8b63163 100644 --- a/linden/indra/newview/llvograss.cpp +++ b/linden/indra/newview/llvograss.cpp | |||
| @@ -163,19 +163,13 @@ void LLVOGrass::initClass() | |||
| 163 | GrassSpeciesData* newGrass = new GrassSpeciesData(); | 163 | GrassSpeciesData* newGrass = new GrassSpeciesData(); |
| 164 | 164 | ||
| 165 | 165 | ||
| 166 | static LLStdStringHandle texture_id_string = LLXmlTree::addAttributeString("texture_id"); | 166 | std::string textureName; |
| 167 | grass_def->getFastAttributeUUID(texture_id_string, id); | ||
| 168 | newGrass->mTextureID = id; | ||
| 169 | 167 | ||
| 170 | if (newGrass->mTextureID.isNull()) | 168 | static LLStdStringHandle texture_name_string = LLXmlTree::addAttributeString("texture_name"); |
| 171 | { | 169 | success &= grass_def->getFastAttributeString(texture_name_string, textureName); |
| 172 | std::string textureName; | 170 | LLViewerImage* grass_image = gImageList.getImageFromFile(textureName); |
| 171 | newGrass->mTextureID = grass_image->getID(); | ||
| 173 | 172 | ||
| 174 | static LLStdStringHandle texture_name_string = LLXmlTree::addAttributeString("texture_name"); | ||
| 175 | success &= grass_def->getFastAttributeString(texture_name_string, textureName); | ||
| 176 | LLViewerImage* grass_image = gImageList.getImageFromFile(textureName); | ||
| 177 | newGrass->mTextureID = grass_image->getID(); | ||
| 178 | } | ||
| 179 | 173 | ||
| 180 | static LLStdStringHandle blade_sizex_string = LLXmlTree::addAttributeString("blade_size_x"); | 174 | static LLStdStringHandle blade_sizex_string = LLXmlTree::addAttributeString("blade_size_x"); |
| 181 | success &= grass_def->getFastAttributeF32(blade_sizex_string, F32_val); | 175 | success &= grass_def->getFastAttributeF32(blade_sizex_string, F32_val); |
diff --git a/linden/indra/newview/llvotree.cpp b/linden/indra/newview/llvotree.cpp index 237f581..208086f 100644 --- a/linden/indra/newview/llvotree.cpp +++ b/linden/indra/newview/llvotree.cpp | |||
| @@ -158,6 +158,11 @@ void LLVOTree::initClass() | |||
| 158 | static LLStdStringHandle texture_id_string = LLXmlTree::addAttributeString("texture_id"); | 158 | static LLStdStringHandle texture_id_string = LLXmlTree::addAttributeString("texture_id"); |
| 159 | success &= tree_def->getFastAttributeUUID(texture_id_string, id); | 159 | success &= tree_def->getFastAttributeUUID(texture_id_string, id); |
| 160 | newTree->mTextureID = id; | 160 | newTree->mTextureID = id; |
| 161 | |||
| 162 | std::string texname; | ||
| 163 | static LLStdStringHandle texture_name = LLXmlTree::addAttributeString("texture_name"); | ||
| 164 | success &= tree_def->getFastAttributeString(texture_name, texname); | ||
| 165 | newTree->mTextureName = texname; | ||
| 161 | 166 | ||
| 162 | static LLStdStringHandle droop_string = LLXmlTree::addAttributeString("droop"); | 167 | static LLStdStringHandle droop_string = LLXmlTree::addAttributeString("droop"); |
| 163 | success &= tree_def->getFastAttributeF32(droop_string, F32_val); | 168 | success &= tree_def->getFastAttributeF32(droop_string, F32_val); |
| @@ -319,7 +324,7 @@ U32 LLVOTree::processUpdateMessage(LLMessageSystem *mesgsys, | |||
| 319 | // | 324 | // |
| 320 | // Load Species-Specific data | 325 | // Load Species-Specific data |
| 321 | // | 326 | // |
| 322 | mTreeImagep = gImageList.getImage(sSpeciesTable[mSpecies]->mTextureID); | 327 | mTreeImagep = gImageList.getImageFromFile(sSpeciesTable[mSpecies]->mTextureName); |
| 323 | if (mTreeImagep) | 328 | if (mTreeImagep) |
| 324 | { | 329 | { |
| 325 | gGL.getTexUnit(0)->bind(mTreeImagep.get()); | 330 | gGL.getTexUnit(0)->bind(mTreeImagep.get()); |
diff --git a/linden/indra/newview/llvotree.h b/linden/indra/newview/llvotree.h index df0b5a9..855c612 100644 --- a/linden/indra/newview/llvotree.h +++ b/linden/indra/newview/llvotree.h | |||
| @@ -129,6 +129,7 @@ public: | |||
| 129 | struct TreeSpeciesData | 129 | struct TreeSpeciesData |
| 130 | { | 130 | { |
| 131 | LLUUID mTextureID; | 131 | LLUUID mTextureID; |
| 132 | std::string mTextureName; | ||
| 132 | 133 | ||
| 133 | F32 mBranchLength; // Scale (length) of tree branches | 134 | F32 mBranchLength; // Scale (length) of tree branches |
| 134 | F32 mDroop; // Droop from vertical (degrees) at each branch recursion | 135 | F32 mDroop; // Droop from vertical (degrees) at each branch recursion |