diff --git a/import/models/Bridge_Bridge_BaseColor.png b/import/models/Bridge_Bridge_BaseColor.png new file mode 100644 index 0000000..62a1cae Binary files /dev/null and b/import/models/Bridge_Bridge_BaseColor.png differ diff --git a/import/models/Bridge_Bridge_Glass_BaseColor.png b/import/models/Bridge_Bridge_Glass_BaseColor.png new file mode 100644 index 0000000..cee00b9 Binary files /dev/null and b/import/models/Bridge_Bridge_Glass_BaseColor.png differ diff --git a/import/models/Bridge_Bridge_Glass_Metallic.png-Bridge_Bridge_Glass_Roughness.png b/import/models/Bridge_Bridge_Glass_Metallic.png-Bridge_Bridge_Glass_Roughness.png new file mode 100644 index 0000000..86e6c51 Binary files /dev/null and b/import/models/Bridge_Bridge_Glass_Metallic.png-Bridge_Bridge_Glass_Roughness.png differ diff --git a/import/models/Bridge_Bridge_Glass_Normal.png b/import/models/Bridge_Bridge_Glass_Normal.png new file mode 100644 index 0000000..4f519f3 Binary files /dev/null and b/import/models/Bridge_Bridge_Glass_Normal.png differ diff --git a/import/models/Bridge_Bridge_Metallic.png-Bridge_Bridge_Roughness.png b/import/models/Bridge_Bridge_Metallic.png-Bridge_Bridge_Roughness.png new file mode 100644 index 0000000..6c4c0bd Binary files /dev/null and b/import/models/Bridge_Bridge_Metallic.png-Bridge_Bridge_Roughness.png differ diff --git a/import/models/Bridge_Bridge_Normal.png b/import/models/Bridge_Bridge_Normal.png new file mode 100644 index 0000000..1371c99 Binary files /dev/null and b/import/models/Bridge_Bridge_Normal.png differ diff --git a/import/models/Bridge_Bridge_Roof_BaseColor.png b/import/models/Bridge_Bridge_Roof_BaseColor.png new file mode 100644 index 0000000..f97b26d Binary files /dev/null and b/import/models/Bridge_Bridge_Roof_BaseColor.png differ diff --git a/import/models/Bridge_Bridge_Roof_Metallic.png-Bridge_Bridge_Roof_Roughness.png b/import/models/Bridge_Bridge_Roof_Metallic.png-Bridge_Bridge_Roof_Roughness.png new file mode 100644 index 0000000..43f8127 Binary files /dev/null and b/import/models/Bridge_Bridge_Roof_Metallic.png-Bridge_Bridge_Roof_Roughness.png differ diff --git a/import/models/Bridge_Bridge_Roof_Normal.png b/import/models/Bridge_Bridge_Roof_Normal.png new file mode 100644 index 0000000..809651e Binary files /dev/null and b/import/models/Bridge_Bridge_Roof_Normal.png differ diff --git a/import/models/Bridge_Deck_Bridge_Deck_Floor_BaseColor.png b/import/models/Bridge_Deck_Bridge_Deck_Floor_BaseColor.png new file mode 100644 index 0000000..f3e23a8 Binary files /dev/null and b/import/models/Bridge_Deck_Bridge_Deck_Floor_BaseColor.png differ diff --git a/import/models/Bridge_Deck_Bridge_Deck_Floor_Metallic.png-Bridge_Deck_Bridge_Deck_Floor_Roughness.png b/import/models/Bridge_Deck_Bridge_Deck_Floor_Metallic.png-Bridge_Deck_Bridge_Deck_Floor_Roughness.png new file mode 100644 index 0000000..ada172d Binary files /dev/null and b/import/models/Bridge_Deck_Bridge_Deck_Floor_Metallic.png-Bridge_Deck_Bridge_Deck_Floor_Roughness.png differ diff --git a/import/models/Bridge_Deck_Bridge_Deck_Floor_Normal.png b/import/models/Bridge_Deck_Bridge_Deck_Floor_Normal.png new file mode 100644 index 0000000..780cfdd Binary files /dev/null and b/import/models/Bridge_Deck_Bridge_Deck_Floor_Normal.png differ diff --git a/import/models/Bridge_Deck_Bridge_Deck_Outer_BaseColor.png b/import/models/Bridge_Deck_Bridge_Deck_Outer_BaseColor.png new file mode 100644 index 0000000..59b6eeb Binary files /dev/null and b/import/models/Bridge_Deck_Bridge_Deck_Outer_BaseColor.png differ diff --git a/import/models/Bridge_Deck_Bridge_Deck_Outer_Metallic.png-Bridge_Deck_Bridge_Deck_Outer_Roughness.png b/import/models/Bridge_Deck_Bridge_Deck_Outer_Metallic.png-Bridge_Deck_Bridge_Deck_Outer_Roughness.png new file mode 100644 index 0000000..d414cf0 Binary files /dev/null and b/import/models/Bridge_Deck_Bridge_Deck_Outer_Metallic.png-Bridge_Deck_Bridge_Deck_Outer_Roughness.png differ diff --git a/import/models/Bridge_Deck_Bridge_Deck_Outer_Normal.png b/import/models/Bridge_Deck_Bridge_Deck_Outer_Normal.png new file mode 100644 index 0000000..10c885b Binary files /dev/null and b/import/models/Bridge_Deck_Bridge_Deck_Outer_Normal.png differ diff --git a/import/models/Guns_Gun_Barrel_Black_BaseColor.png b/import/models/Guns_Gun_Barrel_Black_BaseColor.png new file mode 100644 index 0000000..b0c6b30 Binary files /dev/null and b/import/models/Guns_Gun_Barrel_Black_BaseColor.png differ diff --git a/import/models/Guns_Gun_Barrel_Black_Metallic-Guns_Gun_Barrel_Black_Roughness.png b/import/models/Guns_Gun_Barrel_Black_Metallic-Guns_Gun_Barrel_Black_Roughness.png new file mode 100644 index 0000000..a990727 Binary files /dev/null and b/import/models/Guns_Gun_Barrel_Black_Metallic-Guns_Gun_Barrel_Black_Roughness.png differ diff --git a/import/models/Guns_Gun_Barrel_Black_Normal.png b/import/models/Guns_Gun_Barrel_Black_Normal.png new file mode 100644 index 0000000..4519390 Binary files /dev/null and b/import/models/Guns_Gun_Barrel_Black_Normal.png differ diff --git a/import/models/Guns_Gun_Dark_Grey_BaseColor.png b/import/models/Guns_Gun_Dark_Grey_BaseColor.png new file mode 100644 index 0000000..430f846 Binary files /dev/null and b/import/models/Guns_Gun_Dark_Grey_BaseColor.png differ diff --git a/import/models/Guns_Gun_Dark_Grey_Metallic-Guns_Gun_Dark_Grey_Roughness.png b/import/models/Guns_Gun_Dark_Grey_Metallic-Guns_Gun_Dark_Grey_Roughness.png new file mode 100644 index 0000000..5f25b7a Binary files /dev/null and b/import/models/Guns_Gun_Dark_Grey_Metallic-Guns_Gun_Dark_Grey_Roughness.png differ diff --git a/import/models/Guns_Gun_Dark_Grey_Normal.png b/import/models/Guns_Gun_Dark_Grey_Normal.png new file mode 100644 index 0000000..c7d1c5c Binary files /dev/null and b/import/models/Guns_Gun_Dark_Grey_Normal.png differ diff --git a/import/models/Guns_Gun_Light_Grey_BaseColor.png b/import/models/Guns_Gun_Light_Grey_BaseColor.png new file mode 100644 index 0000000..1eb4989 Binary files /dev/null and b/import/models/Guns_Gun_Light_Grey_BaseColor.png differ diff --git a/import/models/Guns_Gun_Light_Grey_Metallic-Guns_Gun_Light_Grey_Roughness.png b/import/models/Guns_Gun_Light_Grey_Metallic-Guns_Gun_Light_Grey_Roughness.png new file mode 100644 index 0000000..937c14b Binary files /dev/null and b/import/models/Guns_Gun_Light_Grey_Metallic-Guns_Gun_Light_Grey_Roughness.png differ diff --git a/import/models/Guns_Gun_Light_Grey_Normal.png b/import/models/Guns_Gun_Light_Grey_Normal.png new file mode 100644 index 0000000..d29f9a1 Binary files /dev/null and b/import/models/Guns_Gun_Light_Grey_Normal.png differ diff --git a/import/models/Guns_Gun_Scope_Glass_BaseColor.png b/import/models/Guns_Gun_Scope_Glass_BaseColor.png new file mode 100644 index 0000000..cee00b9 Binary files /dev/null and b/import/models/Guns_Gun_Scope_Glass_BaseColor.png differ diff --git a/import/models/Guns_Gun_Scope_Glass_Metallic-Guns_Gun_Scope_Glass_Roughness.png b/import/models/Guns_Gun_Scope_Glass_Metallic-Guns_Gun_Scope_Glass_Roughness.png new file mode 100644 index 0000000..86e6c51 Binary files /dev/null and b/import/models/Guns_Gun_Scope_Glass_Metallic-Guns_Gun_Scope_Glass_Roughness.png differ diff --git a/import/models/Guns_Gun_Scope_Glass_Normal.png b/import/models/Guns_Gun_Scope_Glass_Normal.png new file mode 100644 index 0000000..77b4c6b Binary files /dev/null and b/import/models/Guns_Gun_Scope_Glass_Normal.png differ diff --git a/import/models/Guns_Gun_White_BaseColor.png b/import/models/Guns_Gun_White_BaseColor.png new file mode 100644 index 0000000..af4fd96 Binary files /dev/null and b/import/models/Guns_Gun_White_BaseColor.png differ diff --git a/import/models/Guns_Gun_White_Metallic-Guns_Gun_White_Roughness.png b/import/models/Guns_Gun_White_Metallic-Guns_Gun_White_Roughness.png new file mode 100644 index 0000000..5534d08 Binary files /dev/null and b/import/models/Guns_Gun_White_Metallic-Guns_Gun_White_Roughness.png differ diff --git a/import/models/Guns_Gun_White_Normal.png b/import/models/Guns_Gun_White_Normal.png new file mode 100644 index 0000000..00d57d9 Binary files /dev/null and b/import/models/Guns_Gun_White_Normal.png differ diff --git a/import/models/Hull_Front_Rope_BaseColor.png b/import/models/Hull_Front_Rope_BaseColor.png new file mode 100644 index 0000000..56b909b Binary files /dev/null and b/import/models/Hull_Front_Rope_BaseColor.png differ diff --git a/import/models/Hull_Front_Rope_Metallic.png-Hull_Front_Rope_Roughness.png b/import/models/Hull_Front_Rope_Metallic.png-Hull_Front_Rope_Roughness.png new file mode 100644 index 0000000..bdf9e0d Binary files /dev/null and b/import/models/Hull_Front_Rope_Metallic.png-Hull_Front_Rope_Roughness.png differ diff --git a/import/models/Hull_Front_Rope_Normal.png b/import/models/Hull_Front_Rope_Normal.png new file mode 100644 index 0000000..93bab7d Binary files /dev/null and b/import/models/Hull_Front_Rope_Normal.png differ diff --git a/import/models/Hull_Hull_Bottom_Red_BaseColor.png b/import/models/Hull_Hull_Bottom_Red_BaseColor.png new file mode 100644 index 0000000..f943f51 Binary files /dev/null and b/import/models/Hull_Hull_Bottom_Red_BaseColor.png differ diff --git a/import/models/Hull_Hull_Bottom_Red_Metallic.png-Hull_Hull_Bottom_Red_Roughness.png b/import/models/Hull_Hull_Bottom_Red_Metallic.png-Hull_Hull_Bottom_Red_Roughness.png new file mode 100644 index 0000000..3279736 Binary files /dev/null and b/import/models/Hull_Hull_Bottom_Red_Metallic.png-Hull_Hull_Bottom_Red_Roughness.png differ diff --git a/import/models/Hull_Hull_Bottom_Red_Normal.png b/import/models/Hull_Hull_Bottom_Red_Normal.png new file mode 100644 index 0000000..953c270 Binary files /dev/null and b/import/models/Hull_Hull_Bottom_Red_Normal.png differ diff --git a/import/models/Hull_Hull_Deck_BaseColor.png b/import/models/Hull_Hull_Deck_BaseColor.png new file mode 100644 index 0000000..e757331 Binary files /dev/null and b/import/models/Hull_Hull_Deck_BaseColor.png differ diff --git a/import/models/Hull_Hull_Deck_Metallic.png-Hull_Hull_Deck_Roughness.png b/import/models/Hull_Hull_Deck_Metallic.png-Hull_Hull_Deck_Roughness.png new file mode 100644 index 0000000..0d34ec2 Binary files /dev/null and b/import/models/Hull_Hull_Deck_Metallic.png-Hull_Hull_Deck_Roughness.png differ diff --git a/import/models/Hull_Hull_Deck_Normal.png b/import/models/Hull_Hull_Deck_Normal.png new file mode 100644 index 0000000..9bc02cf Binary files /dev/null and b/import/models/Hull_Hull_Deck_Normal.png differ diff --git a/import/models/Hull_Hull_Main_Colour_BaseColor.png b/import/models/Hull_Hull_Main_Colour_BaseColor.png new file mode 100644 index 0000000..06b8356 Binary files /dev/null and b/import/models/Hull_Hull_Main_Colour_BaseColor.png differ diff --git a/import/models/Hull_Hull_Main_Colour_Metallic-Hull_Hull_Main_Colour_Roughness.png b/import/models/Hull_Hull_Main_Colour_Metallic-Hull_Hull_Main_Colour_Roughness.png new file mode 100644 index 0000000..01a824c Binary files /dev/null and b/import/models/Hull_Hull_Main_Colour_Metallic-Hull_Hull_Main_Colour_Roughness.png differ diff --git a/import/models/Hull_Hull_Main_Colour_Normal.png b/import/models/Hull_Hull_Main_Colour_Normal.png new file mode 100644 index 0000000..a71f7c2 Binary files /dev/null and b/import/models/Hull_Hull_Main_Colour_Normal.png differ diff --git a/import/models/Hull_Hull_Middle_Grey_BaseColor.png b/import/models/Hull_Hull_Middle_Grey_BaseColor.png new file mode 100644 index 0000000..d75a816 Binary files /dev/null and b/import/models/Hull_Hull_Middle_Grey_BaseColor.png differ diff --git a/import/models/Hull_Hull_Middle_Grey_Metallic.png-Hull_Hull_Middle_Grey_Roughness.png b/import/models/Hull_Hull_Middle_Grey_Metallic.png-Hull_Hull_Middle_Grey_Roughness.png new file mode 100644 index 0000000..a9f04cf Binary files /dev/null and b/import/models/Hull_Hull_Middle_Grey_Metallic.png-Hull_Hull_Middle_Grey_Roughness.png differ diff --git a/import/models/Hull_Hull_Middle_Grey_Normal.png b/import/models/Hull_Hull_Middle_Grey_Normal.png new file mode 100644 index 0000000..3a1fc46 Binary files /dev/null and b/import/models/Hull_Hull_Middle_Grey_Normal.png differ diff --git a/import/models/Main_Mast_Section_Black_Colour.002_Metallic-Main_Mast_Section_Black_Colour.png b/import/models/Main_Mast_Section_Black_Colour.002_Metallic-Main_Mast_Section_Black_Colour.png new file mode 100644 index 0000000..abf1d37 Binary files /dev/null and b/import/models/Main_Mast_Section_Black_Colour.002_Metallic-Main_Mast_Section_Black_Colour.png differ diff --git a/import/models/Main_Mast_Section_Black_Colour.png b/import/models/Main_Mast_Section_Black_Colour.png new file mode 100644 index 0000000..9a500ef Binary files /dev/null and b/import/models/Main_Mast_Section_Black_Colour.png differ diff --git a/import/models/Main_Mast_Section_Dark_Grey_Mid_Deck.002_Metallic-Main_Mast_Section_Dark_Grey_Mid_Deck.png b/import/models/Main_Mast_Section_Dark_Grey_Mid_Deck.002_Metallic-Main_Mast_Section_Dark_Grey_Mid_Deck.png new file mode 100644 index 0000000..c7a3503 Binary files /dev/null and b/import/models/Main_Mast_Section_Dark_Grey_Mid_Deck.002_Metallic-Main_Mast_Section_Dark_Grey_Mid_Deck.png differ diff --git a/import/models/Main_Mast_Section_Dark_Grey_Mid_Deck.png b/import/models/Main_Mast_Section_Dark_Grey_Mid_Deck.png new file mode 100644 index 0000000..b2e2a7b Binary files /dev/null and b/import/models/Main_Mast_Section_Dark_Grey_Mid_Deck.png differ diff --git a/import/models/Main_Mast_Section_Main_Vessel_Colour.002_Metallic-Main_Mast_Section_Main_Vessel_Colour.png b/import/models/Main_Mast_Section_Main_Vessel_Colour.002_Metallic-Main_Mast_Section_Main_Vessel_Colour.png new file mode 100644 index 0000000..f26aca6 Binary files /dev/null and b/import/models/Main_Mast_Section_Main_Vessel_Colour.002_Metallic-Main_Mast_Section_Main_Vessel_Colour.png differ diff --git a/import/models/Main_Mast_Section_Main_Vessel_Colour.png b/import/models/Main_Mast_Section_Main_Vessel_Colour.png new file mode 100644 index 0000000..4cbd9eb Binary files /dev/null and b/import/models/Main_Mast_Section_Main_Vessel_Colour.png differ diff --git a/import/models/Middle_Deck_Area_Black_Colour_BaseColor.png b/import/models/Middle_Deck_Area_Black_Colour_BaseColor.png new file mode 100644 index 0000000..5fe902a Binary files /dev/null and b/import/models/Middle_Deck_Area_Black_Colour_BaseColor.png differ diff --git a/import/models/Middle_Deck_Area_Black_Colour_Metallic.png-Middle_Deck_Area_Black_Colour_Roughness.png b/import/models/Middle_Deck_Area_Black_Colour_Metallic.png-Middle_Deck_Area_Black_Colour_Roughness.png new file mode 100644 index 0000000..f0a3d20 Binary files /dev/null and b/import/models/Middle_Deck_Area_Black_Colour_Metallic.png-Middle_Deck_Area_Black_Colour_Roughness.png differ diff --git a/import/models/Middle_Deck_Area_Black_Colour_Normal.png b/import/models/Middle_Deck_Area_Black_Colour_Normal.png new file mode 100644 index 0000000..9d17954 Binary files /dev/null and b/import/models/Middle_Deck_Area_Black_Colour_Normal.png differ diff --git a/import/models/Middle_Deck_Area_Dark_Grey_Mid_Deck_BaseColor.png b/import/models/Middle_Deck_Area_Dark_Grey_Mid_Deck_BaseColor.png new file mode 100644 index 0000000..0c10412 Binary files /dev/null and b/import/models/Middle_Deck_Area_Dark_Grey_Mid_Deck_BaseColor.png differ diff --git a/import/models/Middle_Deck_Area_Dark_Grey_Mid_Deck_Metallic.png-Middle_Deck_Area_Dark_Grey_Mid_Deck_Roughness.png b/import/models/Middle_Deck_Area_Dark_Grey_Mid_Deck_Metallic.png-Middle_Deck_Area_Dark_Grey_Mid_Deck_Roughness.png new file mode 100644 index 0000000..2a0d345 Binary files /dev/null and b/import/models/Middle_Deck_Area_Dark_Grey_Mid_Deck_Metallic.png-Middle_Deck_Area_Dark_Grey_Mid_Deck_Roughness.png differ diff --git a/import/models/Middle_Deck_Area_Dark_Grey_Mid_Deck_Normal.png b/import/models/Middle_Deck_Area_Dark_Grey_Mid_Deck_Normal.png new file mode 100644 index 0000000..886a5f5 Binary files /dev/null and b/import/models/Middle_Deck_Area_Dark_Grey_Mid_Deck_Normal.png differ diff --git a/import/models/Middle_Deck_Area_Main_Vessel_Colour_BaseColor.png b/import/models/Middle_Deck_Area_Main_Vessel_Colour_BaseColor.png new file mode 100644 index 0000000..702a4bf Binary files /dev/null and b/import/models/Middle_Deck_Area_Main_Vessel_Colour_BaseColor.png differ diff --git a/import/models/Middle_Deck_Area_Main_Vessel_Colour_Metallic.png-Middle_Deck_Area_Main_Vessel_Colour_Roughness.png b/import/models/Middle_Deck_Area_Main_Vessel_Colour_Metallic.png-Middle_Deck_Area_Main_Vessel_Colour_Roughness.png new file mode 100644 index 0000000..dfe3b46 Binary files /dev/null and b/import/models/Middle_Deck_Area_Main_Vessel_Colour_Metallic.png-Middle_Deck_Area_Main_Vessel_Colour_Roughness.png differ diff --git a/import/models/Middle_Deck_Area_Main_Vessel_Colour_Normal.png b/import/models/Middle_Deck_Area_Main_Vessel_Colour_Normal.png new file mode 100644 index 0000000..9597238 Binary files /dev/null and b/import/models/Middle_Deck_Area_Main_Vessel_Colour_Normal.png differ diff --git a/import/models/Middle_Deck_Area_Rear_Loading_Door_Colour_BaseColor.png b/import/models/Middle_Deck_Area_Rear_Loading_Door_Colour_BaseColor.png new file mode 100644 index 0000000..26a20c1 Binary files /dev/null and b/import/models/Middle_Deck_Area_Rear_Loading_Door_Colour_BaseColor.png differ diff --git a/import/models/Middle_Deck_Area_Rear_Loading_Door_Colour_Metallic.png-Middle_Deck_Area_Rear_Loading_Door_Colour_Roughness.png b/import/models/Middle_Deck_Area_Rear_Loading_Door_Colour_Metallic.png-Middle_Deck_Area_Rear_Loading_Door_Colour_Roughness.png new file mode 100644 index 0000000..083c940 Binary files /dev/null and b/import/models/Middle_Deck_Area_Rear_Loading_Door_Colour_Metallic.png-Middle_Deck_Area_Rear_Loading_Door_Colour_Roughness.png differ diff --git a/import/models/Middle_Deck_Area_Rear_Loading_Door_Colour_Normal.png b/import/models/Middle_Deck_Area_Rear_Loading_Door_Colour_Normal.png new file mode 100644 index 0000000..74c15a3 Binary files /dev/null and b/import/models/Middle_Deck_Area_Rear_Loading_Door_Colour_Normal.png differ diff --git a/import/models/Missile_Launcher_Launcher_Bay_Inner_BaseColor.png b/import/models/Missile_Launcher_Launcher_Bay_Inner_BaseColor.png new file mode 100644 index 0000000..fef5b4e Binary files /dev/null and b/import/models/Missile_Launcher_Launcher_Bay_Inner_BaseColor.png differ diff --git a/import/models/Missile_Launcher_Launcher_Bay_Inner_Metallic.png-Missile_Launcher_Launcher_Bay_Inner_Roughness.png b/import/models/Missile_Launcher_Launcher_Bay_Inner_Metallic.png-Missile_Launcher_Launcher_Bay_Inner_Roughness.png new file mode 100644 index 0000000..f9940b6 Binary files /dev/null and b/import/models/Missile_Launcher_Launcher_Bay_Inner_Metallic.png-Missile_Launcher_Launcher_Bay_Inner_Roughness.png differ diff --git a/import/models/Missile_Launcher_Launcher_Bay_Inner_Normal.png b/import/models/Missile_Launcher_Launcher_Bay_Inner_Normal.png new file mode 100644 index 0000000..f2b0439 Binary files /dev/null and b/import/models/Missile_Launcher_Launcher_Bay_Inner_Normal.png differ diff --git a/import/models/Missile_Launcher_Launcher_Bay_Outer_BaseColor.png b/import/models/Missile_Launcher_Launcher_Bay_Outer_BaseColor.png new file mode 100644 index 0000000..44058ab Binary files /dev/null and b/import/models/Missile_Launcher_Launcher_Bay_Outer_BaseColor.png differ diff --git a/import/models/Missile_Launcher_Launcher_Bay_Outer_Metallic.png-Missile_Launcher_Launcher_Bay_Outer_Roughness.png b/import/models/Missile_Launcher_Launcher_Bay_Outer_Metallic.png-Missile_Launcher_Launcher_Bay_Outer_Roughness.png new file mode 100644 index 0000000..a1f11d9 Binary files /dev/null and b/import/models/Missile_Launcher_Launcher_Bay_Outer_Metallic.png-Missile_Launcher_Launcher_Bay_Outer_Roughness.png differ diff --git a/import/models/Missile_Launcher_Launcher_Bay_Outer_Normal.png b/import/models/Missile_Launcher_Launcher_Bay_Outer_Normal.png new file mode 100644 index 0000000..396674c Binary files /dev/null and b/import/models/Missile_Launcher_Launcher_Bay_Outer_Normal.png differ diff --git a/import/models/Missile_Launcher_Launcher_End_Structure_BaseColor.png b/import/models/Missile_Launcher_Launcher_End_Structure_BaseColor.png new file mode 100644 index 0000000..7388654 Binary files /dev/null and b/import/models/Missile_Launcher_Launcher_End_Structure_BaseColor.png differ diff --git a/import/models/Missile_Launcher_Launcher_End_Structure_Metallic-Missile_Launcher_Launcher_End_Structure_Roughness.png b/import/models/Missile_Launcher_Launcher_End_Structure_Metallic-Missile_Launcher_Launcher_End_Structure_Roughness.png new file mode 100644 index 0000000..37f8a27 Binary files /dev/null and b/import/models/Missile_Launcher_Launcher_End_Structure_Metallic-Missile_Launcher_Launcher_End_Structure_Roughness.png differ diff --git a/import/models/Missile_Launcher_Launcher_End_Structure_Normal.png b/import/models/Missile_Launcher_Launcher_End_Structure_Normal.png new file mode 100644 index 0000000..722e8ee Binary files /dev/null and b/import/models/Missile_Launcher_Launcher_End_Structure_Normal.png differ diff --git a/import/models/Missile_Launcher_Missile_Launcher_BaseColor.png b/import/models/Missile_Launcher_Missile_Launcher_BaseColor.png new file mode 100644 index 0000000..8cc6428 Binary files /dev/null and b/import/models/Missile_Launcher_Missile_Launcher_BaseColor.png differ diff --git a/import/models/Missile_Launcher_Missile_Launcher_Metallic.png-Missile_Launcher_Missile_Launcher_Roughness.png b/import/models/Missile_Launcher_Missile_Launcher_Metallic.png-Missile_Launcher_Missile_Launcher_Roughness.png new file mode 100644 index 0000000..024a523 Binary files /dev/null and b/import/models/Missile_Launcher_Missile_Launcher_Metallic.png-Missile_Launcher_Missile_Launcher_Roughness.png differ diff --git a/import/models/Missile_Launcher_Missile_Launcher_Normal.png b/import/models/Missile_Launcher_Missile_Launcher_Normal.png new file mode 100644 index 0000000..4213819 Binary files /dev/null and b/import/models/Missile_Launcher_Missile_Launcher_Normal.png differ diff --git a/import/models/Side_Panel_Side_Panel_BaseColor.png b/import/models/Side_Panel_Side_Panel_BaseColor.png new file mode 100644 index 0000000..806524a Binary files /dev/null and b/import/models/Side_Panel_Side_Panel_BaseColor.png differ diff --git a/import/models/Side_Panel_Side_Panel_Metallic-Side_Panel_Side_Panel_Roughness.png b/import/models/Side_Panel_Side_Panel_Metallic-Side_Panel_Side_Panel_Roughness.png new file mode 100644 index 0000000..a6cd598 Binary files /dev/null and b/import/models/Side_Panel_Side_Panel_Metallic-Side_Panel_Side_Panel_Roughness.png differ diff --git a/import/models/Side_Panel_Side_Panel_Normal.png b/import/models/Side_Panel_Side_Panel_Normal.png new file mode 100644 index 0000000..970f5ed Binary files /dev/null and b/import/models/Side_Panel_Side_Panel_Normal.png differ diff --git a/import/models/Side_Panel_Side_Panel_Panels_BaseColor.png b/import/models/Side_Panel_Side_Panel_Panels_BaseColor.png new file mode 100644 index 0000000..39fb1a1 Binary files /dev/null and b/import/models/Side_Panel_Side_Panel_Panels_BaseColor.png differ diff --git a/import/models/Side_Panel_Side_Panel_Panels_Metallic-Side_Panel_Side_Panel_Panels_Roughness.png b/import/models/Side_Panel_Side_Panel_Panels_Metallic-Side_Panel_Side_Panel_Panels_Roughness.png new file mode 100644 index 0000000..89a88ba Binary files /dev/null and b/import/models/Side_Panel_Side_Panel_Panels_Metallic-Side_Panel_Side_Panel_Panels_Roughness.png differ diff --git a/import/models/Side_Panel_Side_Panel_Panels_Normal.png b/import/models/Side_Panel_Side_Panel_Panels_Normal.png new file mode 100644 index 0000000..d1073b3 Binary files /dev/null and b/import/models/Side_Panel_Side_Panel_Panels_Normal.png differ diff --git a/import/models/Side_Panel_Side_Panel_Recess_BaseColor.png b/import/models/Side_Panel_Side_Panel_Recess_BaseColor.png new file mode 100644 index 0000000..479854a Binary files /dev/null and b/import/models/Side_Panel_Side_Panel_Recess_BaseColor.png differ diff --git a/import/models/Side_Panel_Side_Panel_Recess_Metallic-Side_Panel_Side_Panel_Recess_Roughness.png b/import/models/Side_Panel_Side_Panel_Recess_Metallic-Side_Panel_Side_Panel_Recess_Roughness.png new file mode 100644 index 0000000..41ed357 Binary files /dev/null and b/import/models/Side_Panel_Side_Panel_Recess_Metallic-Side_Panel_Side_Panel_Recess_Roughness.png differ diff --git a/import/models/Side_Panel_Side_Panel_Recess_Normal.png b/import/models/Side_Panel_Side_Panel_Recess_Normal.png new file mode 100644 index 0000000..36be14c Binary files /dev/null and b/import/models/Side_Panel_Side_Panel_Recess_Normal.png differ diff --git a/import/models/after-the-rain-vr-sound/source/Leaves0119_14_S.png b/import/models/after-the-rain-vr-sound/source/Leaves0119_14_S.png index 7293a01..5595ca7 100644 Binary files a/import/models/after-the-rain-vr-sound/source/Leaves0119_14_S.png and b/import/models/after-the-rain-vr-sound/source/Leaves0119_14_S.png differ diff --git a/import/models/after-the-rain-vr-sound/source/Whitechapel.blend b/import/models/after-the-rain-vr-sound/source/Whitechapel.blend index d5c9ed9..2741847 100644 Binary files a/import/models/after-the-rain-vr-sound/source/Whitechapel.blend and b/import/models/after-the-rain-vr-sound/source/Whitechapel.blend differ diff --git a/import/models/after-the-rain-vr-sound/source/Whitechapel.blend1 b/import/models/after-the-rain-vr-sound/source/Whitechapel.blend1 index 6e2d862..d5c9ed9 100644 Binary files a/import/models/after-the-rain-vr-sound/source/Whitechapel.blend1 and b/import/models/after-the-rain-vr-sound/source/Whitechapel.blend1 differ diff --git a/import/models/after-the-rain-vr-sound/source/Whitechapel.glb b/import/models/after-the-rain-vr-sound/source/Whitechapel.glb index 3dc0230..411777f 100644 Binary files a/import/models/after-the-rain-vr-sound/source/Whitechapel.glb and b/import/models/after-the-rain-vr-sound/source/Whitechapel.glb differ diff --git a/import/models/sheepsbody.fbx b/import/models/sheepsbody.fbx new file mode 100644 index 0000000..7950de9 Binary files /dev/null and b/import/models/sheepsbody.fbx differ diff --git a/import/models/ship.blend b/import/models/ship.blend new file mode 100644 index 0000000..5cd1176 Binary files /dev/null and b/import/models/ship.blend differ diff --git a/import/models/ship.blend1 b/import/models/ship.blend1 new file mode 100644 index 0000000..df3d615 Binary files /dev/null and b/import/models/ship.blend1 differ diff --git a/import/models/ship.fbx b/import/models/ship.fbx new file mode 100644 index 0000000..5aefeec Binary files /dev/null and b/import/models/ship.fbx differ diff --git a/import/models/ship.glb b/import/models/ship.glb new file mode 100644 index 0000000..61cdf9e Binary files /dev/null and b/import/models/ship.glb differ diff --git a/import/models/test.mtl b/import/models/test.mtl deleted file mode 100644 index abeb500..0000000 --- a/import/models/test.mtl +++ /dev/null @@ -1,22 +0,0 @@ -# Blender 4.1.1 MTL File: 'test.blend' -# www.blender.org - -newmtl Material -Ns 250.000000 -Ka 1.000000 1.000000 1.000000 -Kd 0.800000 0.800000 0.800000 -Ks 0.500000 0.500000 0.500000 -Ke 0.000000 0.000000 0.000000 -Ni 1.450000 -d 1.000000 -illum 2 - -newmtl Material.001 -Ns 250.000000 -Ka 1.000000 1.000000 1.000000 -Kd 0.800000 0.800000 0.800000 -Ks 0.500000 0.500000 0.500000 -Ke 0.000000 0.000000 0.000000 -Ni 1.500000 -d 1.000000 -illum 2 diff --git a/src/MeshShadingDemoGame.cpp b/src/MeshShadingDemoGame.cpp index 6c96e17..809ee98 100644 --- a/src/MeshShadingDemoGame.cpp +++ b/src/MeshShadingDemoGame.cpp @@ -4,6 +4,7 @@ #include "Component/Transform.h" #include "System/FlyCamSystem.h" #include "Component/Path.h" +#include "Component/WaterTile.h" #include "System/SplineCamSystem.h" #include "Graphics/StaticMeshVertexData.h" @@ -119,21 +120,27 @@ void MeshShadingDemoGame::setupScene(PScene scene, PSystemGraph graph) path = new Entity(scene); path->attachComponent(p); - chapel = new StaticMeshActor(scene, AssetRegistry::findMesh("Whitechapel", "Whitechapel")); - //chapel->getTransform().setScale(Vector(0.01, 0.01, 0.01)); - //flyCam = new FlyCam(scene); - //flyCam->attachComponent(Vector4(0, 0, 0, 0), Vector4(1, 1, 1, 2)); - //flyCam->getCamera().mainCamera = true; - followCam = new PathFollowCam(scene); - followCam->getPathFollow().path = path; - followCam->getCamera().mainCamera = true; - //suburbs = new StaticMeshActor(scene, AssetRegistry::findMesh("suburbs", "city-suburbs")); - //test = new StaticMeshActor(scene, AssetRegistry::findMesh("", "cube")); - //test->getTransform().setScale(Vector(1, 1, 1)); - //test->getTransform().setPosition(Vector(0, 0, 100)); + //chapel = new StaticMeshActor(scene, AssetRegistry::findMesh("Whitechapel", "Whitechapel")); + flyCam = new FlyCam(scene); + flyCam->attachComponent(Vector4(0, 0, 0, 0), Vector4(1, 1, 1, 2)); + flyCam->getCamera().mainCamera = true; + //followCam = new PathFollowCam(scene); + //followCam->getPathFollow().path = path; + //followCam->getCamera().mainCamera = true; + test = new StaticMeshActor(scene, AssetRegistry::findMesh("ship", "ship")); + test->getTransform().setScale(Vector(0.01f, 0.01f, 0.01f)); + for (int32 x = -10; x < 10; ++x) { + for (int32 y = -10; y < 10; ++y) { + auto e = scene->createEntity(); + scene->attachComponent(e, Component::WaterTile{ + .location = UVector2(x, y), + .height = 0, + }); + } + } - light = new DirectionalLightActor(scene, Vector4(0.2, 0.3, 0.2, 0.1), Vector(0.1, -1, 0.2)); + light = new DirectionalLightActor(scene, Vector4(0.4, 0.6, 0.4, 0.1), Vector(0.1, -1, 0.2)); graph->addSystem(new FlyCamSystem(scene)); graph->addSystem(new SplineCamSystem(scene)); } diff --git a/src/System/FlyCamSystem.cpp b/src/System/FlyCamSystem.cpp index 2ea0ebc..8dded9f 100644 --- a/src/System/FlyCamSystem.cpp +++ b/src/System/FlyCamSystem.cpp @@ -6,7 +6,7 @@ FlyCamSystem::FlyCamSystem(PScene scene) FlyCamSystem::~FlyCamSystem() {} void FlyCamSystem::update(Component::KeyboardInput& input, Component::Camera& camera, Component::Transform& transform, Component::PointLight& light) { - float cameraMove = static_cast(deltaTime); + float cameraMove = static_cast(deltaTime) * 10; if(input.keys[KeyCode::KEY_LEFT_SHIFT]) { cameraMove *= 10;