Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Newground station cleanup and new textures #5704

Merged
merged 3 commits into from
Jan 7, 2024
Merged

Newground station cleanup and new textures #5704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7147006
Deleting old files
nozmajner Jan 3, 2024
843c982
Adding new files
nozmajner Jan 3, 2024
9e7d649
Updating model file
nozmajner Jan 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Binary file removed data/models/stations/new_ground/LiftColumn.dds
View file
Open in desktop
Binary file not shown.
Binary file removed data/models/stations/new_ground/LiftColumn_illum.dds
View file
Open in desktop
Binary file not shown.
Binary file removed data/models/stations/new_ground/Steelplt.dds
View file
Open in desktop
Binary file not shown.
Binary file added data/models/stations/new_ground/building_diff.dds
View file
Open in desktop
Binary file not shown.
Binary file added data/models/stations/new_ground/building_glow.dds
View file
Open in desktop
Binary file not shown.
Binary file added data/models/stations/new_ground/building_norm.dds
View file
Open in desktop
Binary file not shown.
Binary file added data/models/stations/new_ground/building_spec.dds
View file
Open in desktop
Binary file not shown.
Binary file removed data/models/stations/new_ground/c_metall.dds
View file
Open in desktop
Binary file not shown.
872 changes: 0 additions & 872 deletions data/models/stations/new_ground/landPad6_mesh.dae
View file
Open in desktop

This file was deleted.

632 changes: 0 additions & 632 deletions data/models/stations/new_ground/landPad6_mesh_lores.dae
View file
Open in desktop

This file was deleted.

59 changes: 29 additions & 30 deletions data/models/stations/new_ground/new_ground.model
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,45 +2,44 @@
# The original mesh and textures are available from here for free:
# http://www.scifi3d.com/details.asp?intGenreID=10&intCatID=17&key=85
#
# The original mesh required a lot of cleanup and was very high-poly for game usage
# so had to be simplified and in many cases outright deleted to get it down to budget.
# The upper and lower desking were recreated, polygon winding issues resolved and re-UV'd.
# The original mesh required a lot of cleanup.
#
# New textures and materials were made by me and new geometry for the 4 lifts.
# New textures were made by Keeper1st

material rim
diffuse 1.0 1.0 1.0
material pads
diffuse 0.9 0.9 0.9
specular 0.5 0.5 0.5
tex_diff Steelplt.dds
tex_diff pad_diff.dds
tex_spec pad_spec.dds
tex_glow pad_glow.dds
tex_norm pad_norm.dds

material column
diffuse 1.0 1.0 1.0
material building
diffuse 0.9 0.9 0.9
specular 0.5 0.5 0.5
tex_diff LiftColumn.dds
tex_glow LiftColumn_illum.dds
tex_diff building_diff.dds
tex_spec building_spec.dds
tex_glow building_glow.dds
tex_norm building_norm.dds

material lamp_glow
diffuse 1.0 1.0 1.0
material Glass
diffuse 0.9 0.9 0.9
specular 0.5 0.5 0.5
tex_diff LiftColumn.dds
tex_glow LiftColumn_illum.dds
opacity 60
tex_diff building_diff.dds
tex_spec building_spec.dds
tex_glow building_glow.dds
tex_norm building_norm.dds

material pad
diffuse 1.0 1.0 1.0
specular 0.5 0.5 0.5
tex_diff c_metall.dds

material m4plat_lift_column
diffuse 1.0 1.0 1.0
specular 0.5 0.5 0.5
tex_diff LiftColumn.dds
tex_glow LiftColumn_illum.dds
lod 500
mesh new_ground_hi.dae
mesh new_ground_landing.dae

lod 300
mesh landPad6_mesh_lores.dae
lod 200
mesh new_ground_mid.dae

lod 2000
mesh landPad6_docking.dae
mesh landPad6_mesh.dae
lod 50
mesh new_ground_lo.dae

collision landPad6_collision.dae
collision new_ground_coll.dae
0 ...tations/new_ground/landPad6_collision.dae → ...s/stations/new_ground/new_ground_coll.dae
View file
Open in desktop
File renamed without changes.
1,340 changes: 1,340 additions & 0 deletions data/models/stations/new_ground/new_ground_hi.dae
View file
Open in desktop

Large diffs are not rendered by default.

128 changes: 65 additions & 63 deletions .../stations/new_ground/landPad6_docking.dae → ...tations/new_ground/new_ground_landing.dae
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,119 +3,121 @@
<asset>
<contributor>
<author>Blender User</author>
<authoring_tool>Blender 3.0.0 Beta commit date:2021-10-27, commit time:22:07, hash:b838eaf2b960</authoring_tool>
<authoring_tool>Blender 3.3.6 commit date:2023-04-17, commit time:14:03, hash:948f8298b982</authoring_tool>
</contributor>
<created>2021-10-30T09:08:24</created>
<modified>2021-10-30T09:08:24</modified>
<created>2024-01-03T12:37:47</created>
<modified>2024-01-03T12:37:47</modified>
<unit name="meter" meter="1"/>
<up_axis>Z_UP</up_axis>
</asset>
<library_effects/>
<library_images/>
<library_geometries>
<geometry id="meshId0_name_001-mesh" name="meshId0_name.001">
<geometry id="meshId0_name_002-mesh" name="meshId0_name.002">
<mesh>
<source id="meshId0_name_001-mesh-positions">
<float_array id="meshId0_name_001-mesh-positions-array" count="48">57.94061 -49.82686 0 57.94061 49.82686 0 -57.94061 -49.82686 0 -57.94061 49.82686 0 27.47544 96.41222 0 -27.47544 96.41222 0 27.0193 -96.41223 0 -27.0193 -96.41223 0 57.94061 -3.8147e-6 -5 57.94061 -3.8147e-6 -3.8147e-6 -57.94061 -3.8147e-6 -5 -57.94061 -3.8147e-6 -3.8147e-6 0 96.00324 -5.000008 0 96.00324 -7.62939e-6 7.62939e-6 -96.00324 -5.000008 7.62939e-6 -96.00324 -7.62939e-6</float_array>
<source id="meshId0_name_002-mesh-positions">
<float_array id="meshId0_name_002-mesh-positions-array" count="48">57.94061 -49.82686 0 57.94061 49.82686 0 -57.94061 -49.82686 0 -57.94061 49.82686 0 27.47544 96.41222 0 -27.47544 96.41222 0 27.0193 -96.41223 0 -27.0193 -96.41223 0 57.94061 -3.8147e-6 -5 57.94061 -3.8147e-6 -3.8147e-6 -57.94061 -3.8147e-6 -5 -57.94061 -3.8147e-6 -3.8147e-6 0 96.00324 -5.000008 0 96.00324 -7.62939e-6 7.62939e-6 -96.00324 -5.000008 7.62939e-6 -96.00324 -7.62939e-6</float_array>
<technique_common>
<accessor source="#meshId0_name_001-mesh-positions-array" count="16" stride="3">
<accessor source="#meshId0_name_002-mesh-positions-array" count="16" stride="3">
<param name="X" type="float"/>
<param name="Y" type="float"/>
<param name="Z" type="float"/>
</accessor>
</technique_common>
</source>
<source id="meshId0_name_001-mesh-normals">
<float_array id="meshId0_name_001-mesh-normals-array" count="9">0 0 1 0 -1 0 1 0 0</float_array>
<source id="meshId0_name_002-mesh-normals">
<float_array id="meshId0_name_002-mesh-normals-array" count="9">0 0 1 0 -1 0 1 0 0</float_array>
<technique_common>
<accessor source="#meshId0_name_001-mesh-normals-array" count="3" stride="3">
<accessor source="#meshId0_name_002-mesh-normals-array" count="3" stride="3">
<param name="X" type="float"/>
<param name="Y" type="float"/>
<param name="Z" type="float"/>
</accessor>
</technique_common>
</source>
<source id="meshId0_name_001-mesh-map-0">
<float_array id="meshId0_name_001-mesh-map-0-array" count="60">0 1 1 1 1 1 1 0 0 0 0 0 1 1 0 0 0 1 1 1 0 0 0 1 1 1 0 0 0 1 0 1 0 1 1 1 1 0 1 0 0 0 1 1 1 0 0 0 1 1 1 0 0 0 1 1 1 0 0 0</float_array>
<source id="meshId0_name_002-mesh-map-0">
<float_array id="meshId0_name_002-mesh-map-0-array" count="40">1 1 0 1 0 1 1 1 0 0 1 0 1 0 0 0 0 1 1 1 1 0 0 0 0 1 1 1 1 0 0 0 0 1 1 1 1 0 0 0</float_array>
<technique_common>
<accessor source="#meshId0_name_001-mesh-map-0-array" count="30" stride="2">
<accessor source="#meshId0_name_002-mesh-map-0-array" count="20" stride="2">
<param name="S" type="float"/>
<param name="T" type="float"/>
</accessor>
</technique_common>
</source>
<vertices id="meshId0_name_001-mesh-vertices">
<input semantic="POSITION" source="#meshId0_name_001-mesh-positions"/>
<vertices id="meshId0_name_002-mesh-vertices">
<input semantic="POSITION" source="#meshId0_name_002-mesh-positions"/>
</vertices>
<triangles count="10">
<input semantic="VERTEX" source="#meshId0_name_001-mesh-vertices" offset="0"/>
<input semantic="NORMAL" source="#meshId0_name_001-mesh-normals" offset="1"/>
<input semantic="TEXCOORD" source="#meshId0_name_001-mesh-map-0" offset="2" set="0"/>
<p>1 0 0 5 0 1 3 0 2 2 0 3 6 0 4 0 0 5 3 0 6 0 0 7 1 0 8 11 1 9 8 1 10 9 1 11 15 2 12 12 2 13 13 2 14 1 0 15 4 0 16 5 0 17 2 0 18 7 0 19 6 0 20 3 0 21 2 0 22 0 0 23 11 1 24 10 1 25 8 1 26 15 2 27 14 2 28 12 2 29</p>
</triangles>
<polylist count="5">
<input semantic="VERTEX" source="#meshId0_name_002-mesh-vertices" offset="0"/>
<input semantic="NORMAL" source="#meshId0_name_002-mesh-normals" offset="1"/>
<input semantic="TEXCOORD" source="#meshId0_name_002-mesh-map-0" offset="2" set="0"/>
<vcount>4 4 4 4 4 </vcount>
<p>3 0 0 1 0 1 4 0 2 5 0 3 0 0 4 2 0 5 7 0 6 6 0 7 1 0 8 3 0 9 2 0 10 0 0 11 9 1 12 11 1 13 10 1 14 8 1 15 13 2 16 15 2 17 14 2 18 12 2 19</p>
</polylist>
</mesh>
</geometry>
</library_geometries>
<library_visual_scenes>
<visual_scene id="Scene" name="Scene">
<node id="collision_pad06" name="collision_pad06" type="NODE">
<matrix sid="transform">1 0 0 -150 0 1 0 -300 0 0 1 72.83765 0 0 0 1</matrix>
<instance_geometry url="#meshId0_name_001-mesh" name="collision_pad06"/>
</node>
<node id="collision_pad05" name="collision_pad05" type="NODE">
<matrix sid="transform">1 0 0 150 0 1 0 -300 0 0 1 72.83765 0 0 0 1</matrix>
<instance_geometry url="#meshId0_name_001-mesh" name="collision_pad05"/>
<node id="loc_A001_p01_s0_100_b01" name="loc_A001_p01_s0_100_b01" type="NODE">
<matrix sid="transform">0.254 0 0 150.1 0 1.40293e-7 -0.254 300 0 0.254 1.40293e-7 72.58245 0 0 0 1</matrix>
</node>
<node id="collision_pad04" name="collision_pad04" type="NODE">
<matrix sid="transform">1 0 0 -150 0 1 0 -3.86677e-6 0 0 1 72.8377 0 0 0 1</matrix>
<instance_geometry url="#meshId0_name_001-mesh" name="collision_pad04"/>
<node id="entrance_port01" name="entrance_port01" type="NODE">
<matrix sid="transform">1 -4.44089e-16 -4.44091e-16 150.1 -4.4409e-16 5.52335e-7 -1 300 4.4409e-16 1 5.52335e-7 72.58245 0 0 0 1</matrix>
</node>
<node id="collision_pad03" name="collision_pad03" type="NODE">
<matrix sid="transform">1 0 0 150 0 1 0 -3.86677e-6 0 0 1 72.8377 0 0 0 1</matrix>
<instance_geometry url="#meshId0_name_001-mesh" name="collision_pad03"/>
<node id="loc_B001_p02_s0_100_b02" name="loc_B001_p02_s0_100_b02" type="NODE">
<matrix sid="transform">0.254 0 0 -149.9 0 1.40293e-7 -0.254 300.133 0 0.254 1.40293e-7 72.58245 0 0 0 1</matrix>
</node>
<node id="collision_pad02" name="collision_pad02" type="NODE">
<matrix sid="transform">1 0 0 -150 0 1 0 300 0 0 1 72.83775 0 0 0 1</matrix>
<instance_geometry url="#meshId0_name_001-mesh" name="collision_pad02"/>
<node id="entrance_port02" name="entrance_port02" type="NODE">
<matrix sid="transform">1 -4.44089e-16 -4.44091e-16 -149.9 -4.4409e-16 5.52335e-7 -1 300.133 4.4409e-16 1 5.52335e-7 72.58245 0 0 0 1</matrix>
</node>
<node id="collision_pad1" name="collision_pad1" type="NODE">
<matrix sid="transform">1 0 0 150 0 1 0 300 0 0 1 72.83775 0 0 0 1</matrix>
<instance_geometry url="#meshId0_name_001-mesh" name="collision_pad1"/>
<node id="loc_C001_p03_s0_100_b03" name="loc_C001_p03_s0_100_b03" type="NODE">
<matrix sid="transform">0.254 0 0 150.1 0 1.40293e-7 -0.254 0.1334229 0 0.254 1.40293e-7 72.58245 0 0 0 1</matrix>
</node>
<node id="entrance_port06" name="entrance_port06" type="NODE">
<matrix sid="transform">1 -2.22045e-16 -2.22045e-16 -150 -2.22045e-16 5.52335e-7 -1 -299.9999 2.22045e-16 1 5.52335e-7 72.83769 0 0 0 1</matrix>
<node id="entrance_port03" name="entrance_port03" type="NODE">
<matrix sid="transform">1 -4.44089e-16 -4.44091e-16 150.1 -4.4409e-16 5.52335e-7 -1 0.1334229 4.4409e-16 1 5.52335e-7 72.58245 0 0 0 1</matrix>
</node>
<node id="loc_F001_p06_s0_100_b06" name="loc_F001_p06_s0_100_b06" type="NODE">
<matrix sid="transform">1 0 0 -150 0 5.52335e-7 -1 -299.9999 0 1 5.52335e-7 72.83769 0 0 0 1</matrix>
<node id="loc_D001_p04_s0_100_b04" name="loc_D001_p04_s0_100_b04" type="NODE">
<matrix sid="transform">0.254 0 0 -149.9 0 1.40293e-7 -0.254 0.1334229 0 0.254 1.40293e-7 72.58245 0 0 0 1</matrix>
</node>
<node id="entrance_port05" name="entrance_port05" type="NODE">
<matrix sid="transform">1 -2.22045e-16 -2.22045e-16 150 -2.22045e-16 5.52335e-7 -1 -299.9999 2.22045e-16 1 5.52335e-7 72.83769 0 0 0 1</matrix>
<node id="entrance_port04" name="entrance_port04" type="NODE">
<matrix sid="transform">1 -4.44089e-16 -4.44091e-16 -149.9 -4.4409e-16 5.52335e-7 -1 0.1334229 4.4409e-16 1 5.52335e-7 72.58245 0 0 0 1</matrix>
</node>
<node id="loc_E001_p05_s0_100_b05" name="loc_E001_p05_s0_100_b05" type="NODE">
<matrix sid="transform">1 0 0 150 0 5.52335e-7 -1 -299.9999 0 1 5.52335e-7 72.83769 0 0 0 1</matrix>
<matrix sid="transform">0.254 0 0 150.1 0 1.40293e-7 -0.254 -299.867 0 0.254 1.40293e-7 72.58245 0 0 0 1</matrix>
</node>
<node id="entrance_port04" name="entrance_port04" type="NODE">
<matrix sid="transform">1 -2.22045e-16 -2.22045e-16 -150 -2.22045e-16 5.52335e-7 -1 6.54808e-5 2.22045e-16 1 5.52335e-7 72.83748 0 0 0 1</matrix>
<node id="entrance_port05" name="entrance_port05" type="NODE">
<matrix sid="transform">1 -4.44089e-16 -4.44091e-16 150.1 -4.4409e-16 5.52335e-7 -1 -299.867 4.4409e-16 1 5.52335e-7 72.58245 0 0 0 1</matrix>
</node>
<node id="loc_D001_p04_s0_100_b04" name="loc_D001_p04_s0_100_b04" type="NODE">
<matrix sid="transform">1 0 0 -150 0 5.52335e-7 -1 6.54808e-5 0 1 5.52335e-7 72.83748 0 0 0 1</matrix>
<node id="loc_F001_p06_s0_100_b06" name="loc_F001_p06_s0_100_b06" type="NODE">
<matrix sid="transform">0.254 0 0 -149.8997 0 1.40293e-7 -0.254 -299.9033 0 0.254 1.40293e-7 72.58245 0 0 0 1</matrix>
</node>
<node id="entrance_port03" name="entrance_port03" type="NODE">
<matrix sid="transform">1 -2.22045e-16 -2.22045e-16 150 -2.22045e-16 5.52335e-7 -1 6.54808e-5 2.22045e-16 1 5.52335e-7 72.83748 0 0 0 1</matrix>
<node id="entrance_port06" name="entrance_port06" type="NODE">
<matrix sid="transform">1 -4.44089e-16 -4.44091e-16 -149.8997 -4.4409e-16 5.52335e-7 -1 -299.9033 4.4409e-16 1 5.52335e-7 72.58245 0 0 0 1</matrix>
</node>
<node id="loc_C001_p03_s0_100_b03" name="loc_C001_p03_s0_100_b03" type="NODE">
<matrix sid="transform">1 0 0 150 0 5.52335e-7 -1 6.54808e-5 0 1 5.52335e-7 72.83748 0 0 0 1</matrix>
<node id="collision_pad1" name="collision_pad1" type="NODE">
<matrix sid="transform">1 0 0 150 0 1 0 300 0 0 1 72.83775 0 0 0 1</matrix>
<instance_geometry url="#meshId0_name_002-mesh" name="collision_pad1"/>
</node>
<node id="entrance_port02" name="entrance_port02" type="NODE">
<matrix sid="transform">1 -2.22045e-16 -2.22045e-16 -150 -2.22045e-16 5.52335e-7 -1 300.0001 2.22045e-16 1 5.52335e-7 72.83727 0 0 0 1</matrix>
<node id="collision_pad02" name="collision_pad02" type="NODE">
<matrix sid="transform">1 0 0 -150 0 1 0 300 0 0 1 72.83775 0 0 0 1</matrix>
<instance_geometry url="#meshId0_name_002-mesh" name="collision_pad02"/>
</node>
<node id="loc_B001_p02_s0_100_b02" name="loc_B001_p02_s0_100_b02" type="NODE">
<matrix sid="transform">1 0 0 -150 0 5.52335e-7 -1 300.0001 0 1 5.52335e-7 72.83727 0 0 0 1</matrix>
<node id="collision_pad03" name="collision_pad03" type="NODE">
<matrix sid="transform">1 0 0 150 0 1 0 -3.86677e-6 0 0 1 72.8377 0 0 0 1</matrix>
<instance_geometry url="#meshId0_name_002-mesh" name="collision_pad03"/>
</node>
<node id="entrance_port01" name="entrance_port01" type="NODE">
<matrix sid="transform">1 -2.22045e-16 -2.22045e-16 150 -2.22045e-16 5.52335e-7 -1 300.0001 2.22045e-16 1 5.52335e-7 72.83727 0 0 0 1</matrix>
<node id="collision_pad04" name="collision_pad04" type="NODE">
<matrix sid="transform">1 0 0 -150 0 1 0 -3.86677e-6 0 0 1 72.8377 0 0 0 1</matrix>
<instance_geometry url="#meshId0_name_002-mesh" name="collision_pad04"/>
</node>
<node id="loc_A001_p01_s0_100_b01" name="loc_A001_p01_s0_100_b01" type="NODE">
<matrix sid="transform">1 0 0 150 0 5.52335e-7 -1 300.0001 0 1 5.52335e-7 72.83727 0 0 0 1</matrix>
<node id="collision_pad05" name="collision_pad05" type="NODE">
<matrix sid="transform">1 0 0 150 0 1 0 -300 0 0 1 72.83765 0 0 0 1</matrix>
<instance_geometry url="#meshId0_name_002-mesh" name="collision_pad05"/>
</node>
<node id="collision_pad06" name="collision_pad06" type="NODE">
<matrix sid="transform">1 0 0 -150 0 1 0 -300 0 0 1 72.83765 0 0 0 1</matrix>
<instance_geometry url="#meshId0_name_002-mesh" name="collision_pad06"/>
</node>
</visual_scene>
</library_visual_scenes>
Expand Down