diff --git a/Editor/MaterialWindow.cpp b/Editor/MaterialWindow.cpp index c4b03141d..6604ac17e 100644 --- a/Editor/MaterialWindow.cpp +++ b/Editor/MaterialWindow.cpp @@ -174,7 +174,7 @@ MaterialWindow::MaterialWindow(wiGUI* gui) : GUI(gui) pomSlider->OnSlide([&](wiEventArgs args) { MaterialComponent* material = wiRenderer::GetScene().materials.GetComponent(entity); if (material != nullptr) - material->parallaxOcclusionMapping = args.fValue; + material->SetParallaxOcclusionMapping(args.fValue); }); materialWindow->AddWidget(pomSlider); @@ -356,8 +356,9 @@ MaterialWindow::MaterialWindow(wiGUI* gui) : GUI(gui) if (GetSaveFileNameA(&ofn) == TRUE) { string fileName = ofn.lpstrFile; material->baseColorMap = (Texture2D*)wiResourceManager::GetGlobal().add(fileName); - material->baseColorMapName = wiHelper::GetFileNameFromPath(fileName); - texture_baseColor_Button->SetText(material->baseColorMapName); + material->baseColorMapName = fileName; + fileName = wiHelper::GetFileNameFromPath(fileName); + texture_baseColor_Button->SetText(fileName); } } }); @@ -408,8 +409,9 @@ MaterialWindow::MaterialWindow(wiGUI* gui) : GUI(gui) if (GetSaveFileNameA(&ofn) == TRUE) { string fileName = ofn.lpstrFile; material->normalMap = (Texture2D*)wiResourceManager::GetGlobal().add(fileName); - material->normalMapName = wiHelper::GetFileNameFromPath(fileName); - texture_normal_Button->SetText(material->normalMapName); + material->normalMapName = fileName; + fileName = wiHelper::GetFileNameFromPath(fileName); + texture_normal_Button->SetText(fileName); } } }); @@ -460,8 +462,9 @@ MaterialWindow::MaterialWindow(wiGUI* gui) : GUI(gui) if (GetSaveFileNameA(&ofn) == TRUE) { string fileName = ofn.lpstrFile; material->surfaceMap = (Texture2D*)wiResourceManager::GetGlobal().add(fileName); - material->surfaceMapName = wiHelper::GetFileNameFromPath(fileName); - texture_surface_Button->SetText(material->surfaceMapName); + material->surfaceMapName = fileName; + fileName = wiHelper::GetFileNameFromPath(fileName); + texture_surface_Button->SetText(fileName); } } }); @@ -512,8 +515,9 @@ MaterialWindow::MaterialWindow(wiGUI* gui) : GUI(gui) if (GetSaveFileNameA(&ofn) == TRUE) { string fileName = ofn.lpstrFile; material->displacementMap = (Texture2D*)wiResourceManager::GetGlobal().add(fileName); - material->displacementMapName = wiHelper::GetFileNameFromPath(fileName); - texture_displacement_Button->SetText(material->displacementMapName); + material->displacementMapName = fileName; + fileName = wiHelper::GetFileNameFromPath(fileName); + texture_displacement_Button->SetText(fileName); } } }); diff --git a/Editor/WeatherWindow.cpp b/Editor/WeatherWindow.cpp index 5b21bea4a..6046052ce 100644 --- a/Editor/WeatherWindow.cpp +++ b/Editor/WeatherWindow.cpp @@ -77,11 +77,20 @@ WeatherWindow::WeatherWindow(wiGUI* gui) : GUI(gui) windSpeedSlider = new wiSlider(0.001f, 0.2f, 0.1f, 10000, "Wind Speed: "); windSpeedSlider->SetSize(XMFLOAT2(100, 30)); windSpeedSlider->SetPos(XMFLOAT2(x, y += step)); - windSpeedSlider->OnSlide([&](wiEventArgs args) { - GetWeather().windDirection = XMFLOAT3(args.fValue, 0, 0); - }); weatherWindow->AddWidget(windSpeedSlider); + windDirectionSlider = new wiSlider(0, 1, 0, 10000, "Wind Direction: "); + windDirectionSlider->SetSize(XMFLOAT2(100, 30)); + windDirectionSlider->SetPos(XMFLOAT2(x, y += step)); + windDirectionSlider->OnSlide([&](wiEventArgs args) { + XMMATRIX rot = XMMatrixRotationY(args.fValue * XM_PI * 2); + XMVECTOR dir = XMVectorSet(1, 0, 0, 0); + dir = XMVector3TransformNormal(dir, rot); + dir *= windSpeedSlider->GetValue(); + XMStoreFloat3(&GetWeather().windDirection, dir); + }); + weatherWindow->AddWidget(windDirectionSlider); + skyButton = new wiButton("Load Sky"); skyButton->SetTooltip("Load a skybox cubemap texture..."); @@ -290,7 +299,7 @@ void WeatherWindow::UpdateFromRenderer() cloudinessSlider->SetValue(weather.cloudiness); cloudScaleSlider->SetValue(weather.cloudScale); cloudSpeedSlider->SetValue(weather.cloudSpeed); - windSpeedSlider->SetValue(weather.windDirection.x); + windSpeedSlider->SetValue(wiMath::Length(weather.windDirection)); } WeatherComponent& WeatherWindow::GetWeather() const diff --git a/Editor/WeatherWindow.h b/Editor/WeatherWindow.h index d7df55219..0afd9dcd8 100644 --- a/Editor/WeatherWindow.h +++ b/Editor/WeatherWindow.h @@ -29,6 +29,7 @@ public: wiSlider* cloudScaleSlider; wiSlider* cloudSpeedSlider; wiSlider* windSpeedSlider; + wiSlider* windDirectionSlider; wiButton* skyButton; wiColorPicker* ambientColorPicker; wiColorPicker* horizonColorPicker; diff --git a/WickedEngine/wiSceneSystem_Serializers.cpp b/WickedEngine/wiSceneSystem_Serializers.cpp index d0185c9c0..be748aeae 100644 --- a/WickedEngine/wiSceneSystem_Serializers.cpp +++ b/WickedEngine/wiSceneSystem_Serializers.cpp @@ -76,6 +76,8 @@ namespace wiSceneSystem } void MaterialComponent::Serialize(wiArchive& archive, uint32_t seed) { + std::string dir = archive.GetSourceDirectory(); + if (archive.IsReadMode()) { archive >> _flags; @@ -104,22 +106,21 @@ namespace wiSceneSystem SetDirty(); - std::string texturesDir = archive.GetSourceDirectory(); if (!baseColorMapName.empty()) { - baseColorMap = (wiGraphicsTypes::Texture2D*)wiResourceManager::GetGlobal().add(texturesDir + baseColorMapName); + baseColorMap = (wiGraphicsTypes::Texture2D*)wiResourceManager::GetGlobal().add(dir + baseColorMapName); } if (!surfaceMapName.empty()) { - surfaceMap = (wiGraphicsTypes::Texture2D*)wiResourceManager::GetGlobal().add(texturesDir + surfaceMapName); + surfaceMap = (wiGraphicsTypes::Texture2D*)wiResourceManager::GetGlobal().add(dir + surfaceMapName); } if (!normalMapName.empty()) { - normalMap = (wiGraphicsTypes::Texture2D*)wiResourceManager::GetGlobal().add(texturesDir + normalMapName); + normalMap = (wiGraphicsTypes::Texture2D*)wiResourceManager::GetGlobal().add(dir + normalMapName); } if (!displacementMapName.empty()) { - displacementMap = (wiGraphicsTypes::Texture2D*)wiResourceManager::GetGlobal().add(texturesDir + displacementMapName); + displacementMap = (wiGraphicsTypes::Texture2D*)wiResourceManager::GetGlobal().add(dir + displacementMapName); } } @@ -144,6 +145,33 @@ namespace wiSceneSystem archive << texAnimFrameRate; archive << texAnimElapsedTime; + // If detecting an absolute path in textures, remove it and convert to relative: + { + size_t found = baseColorMapName.rfind(dir); + if (found != std::string::npos) + { + baseColorMapName = baseColorMapName.substr(found + dir.length()); + } + + found = surfaceMapName.rfind(dir); + if (found != std::string::npos) + { + surfaceMapName = surfaceMapName.substr(found + dir.length()); + } + + found = normalMapName.rfind(dir); + if (found != std::string::npos) + { + normalMapName = normalMapName.substr(found + dir.length()); + } + + found = displacementMapName.rfind(dir); + if (found != std::string::npos) + { + displacementMapName = displacementMapName.substr(found + dir.length()); + } + } + archive << baseColorMapName; archive << surfaceMapName; archive << normalMapName; diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp index b579c02ab..e306eabf2 100644 --- a/WickedEngine/wiVersion.cpp +++ b/WickedEngine/wiVersion.cpp @@ -9,7 +9,7 @@ namespace wiVersion // minor features, major updates const int minor = 24; // minor bug fixes, alterations, refactors, updates - const int revision = 13; + const int revision = 14; long GetVersion() diff --git a/models/Sponza/sponza.wiscene b/models/Sponza/sponza.wiscene new file mode 100644 index 000000000..43c39d794 Binary files /dev/null and b/models/Sponza/sponza.wiscene differ diff --git a/models/Sponza/textures/background.png b/models/Sponza/textures/background.png new file mode 100644 index 000000000..f516c6ee6 Binary files /dev/null and b/models/Sponza/textures/background.png differ diff --git a/models/Sponza/textures/backgroundBGR.png b/models/Sponza/textures/backgroundBGR.png new file mode 100644 index 000000000..5655e1498 Binary files /dev/null and b/models/Sponza/textures/backgroundBGR.png differ diff --git a/models/Sponza/textures/background_bump.png b/models/Sponza/textures/background_bump.png new file mode 100644 index 000000000..78fdb283e Binary files /dev/null and b/models/Sponza/textures/background_bump.png differ diff --git a/models/Sponza/textures/background_ddn.png b/models/Sponza/textures/background_ddn.png new file mode 100644 index 000000000..0d53458d7 Binary files /dev/null and b/models/Sponza/textures/background_ddn.png differ diff --git a/models/Sponza/textures/chain_texture.png b/models/Sponza/textures/chain_texture.png new file mode 100644 index 000000000..b64b1d03e Binary files /dev/null and b/models/Sponza/textures/chain_texture.png differ diff --git a/models/Sponza/textures/chain_texture_bump.png b/models/Sponza/textures/chain_texture_bump.png new file mode 100644 index 000000000..815db21b9 Binary files /dev/null and b/models/Sponza/textures/chain_texture_bump.png differ diff --git a/models/Sponza/textures/chain_texture_ddn.png b/models/Sponza/textures/chain_texture_ddn.png new file mode 100644 index 000000000..d9284b3be Binary files /dev/null and b/models/Sponza/textures/chain_texture_ddn.png differ diff --git a/models/Sponza/textures/chain_texture_mask.png b/models/Sponza/textures/chain_texture_mask.png new file mode 100644 index 000000000..658cbeb98 Binary files /dev/null and b/models/Sponza/textures/chain_texture_mask.png differ diff --git a/models/Sponza/textures/gi_flag.png b/models/Sponza/textures/gi_flag.png new file mode 100644 index 000000000..c70e0eb2f Binary files /dev/null and b/models/Sponza/textures/gi_flag.png differ diff --git a/models/Sponza/textures/lion.png b/models/Sponza/textures/lion.png new file mode 100644 index 000000000..ac86e4b73 Binary files /dev/null and b/models/Sponza/textures/lion.png differ diff --git a/models/Sponza/textures/lion2_bump.png b/models/Sponza/textures/lion2_bump.png new file mode 100644 index 000000000..5d8408866 Binary files /dev/null and b/models/Sponza/textures/lion2_bump.png differ diff --git a/models/Sponza/textures/lion2_ddn.png b/models/Sponza/textures/lion2_ddn.png new file mode 100644 index 000000000..75af58c1e Binary files /dev/null and b/models/Sponza/textures/lion2_ddn.png differ diff --git a/models/Sponza/textures/lion_bump.png b/models/Sponza/textures/lion_bump.png new file mode 100644 index 000000000..2d55b8e7d Binary files /dev/null and b/models/Sponza/textures/lion_bump.png differ diff --git a/models/Sponza/textures/lion_ddn.png b/models/Sponza/textures/lion_ddn.png new file mode 100644 index 000000000..b2b64a453 Binary files /dev/null and b/models/Sponza/textures/lion_ddn.png differ diff --git a/models/Sponza/textures/spnza_bricks_a_bump.png b/models/Sponza/textures/spnza_bricks_a_bump.png new file mode 100644 index 000000000..c30ce2017 Binary files /dev/null and b/models/Sponza/textures/spnza_bricks_a_bump.png differ diff --git a/models/Sponza/textures/spnza_bricks_a_ddn.png b/models/Sponza/textures/spnza_bricks_a_ddn.png new file mode 100644 index 000000000..a416b3ab4 Binary files /dev/null and b/models/Sponza/textures/spnza_bricks_a_ddn.png differ diff --git a/models/Sponza/textures/spnza_bricks_a_diff.png b/models/Sponza/textures/spnza_bricks_a_diff.png new file mode 100644 index 000000000..e8e6ba83a Binary files /dev/null and b/models/Sponza/textures/spnza_bricks_a_diff.png differ diff --git a/models/Sponza/textures/spnza_bricks_a_spec.png b/models/Sponza/textures/spnza_bricks_a_spec.png new file mode 100644 index 000000000..497570894 Binary files /dev/null and b/models/Sponza/textures/spnza_bricks_a_spec.png differ diff --git a/models/Sponza/textures/sponza_arch_bump.png b/models/Sponza/textures/sponza_arch_bump.png new file mode 100644 index 000000000..752082dd9 Binary files /dev/null and b/models/Sponza/textures/sponza_arch_bump.png differ diff --git a/models/Sponza/textures/sponza_arch_ddn.png b/models/Sponza/textures/sponza_arch_ddn.png new file mode 100644 index 000000000..7b3785b4f Binary files /dev/null and b/models/Sponza/textures/sponza_arch_ddn.png differ diff --git a/models/Sponza/textures/sponza_arch_diff.png b/models/Sponza/textures/sponza_arch_diff.png new file mode 100644 index 000000000..7e7f15d2b Binary files /dev/null and b/models/Sponza/textures/sponza_arch_diff.png differ diff --git a/models/Sponza/textures/sponza_arch_diff_NRM.png b/models/Sponza/textures/sponza_arch_diff_NRM.png new file mode 100644 index 000000000..b3f05d28e Binary files /dev/null and b/models/Sponza/textures/sponza_arch_diff_NRM.png differ diff --git a/models/Sponza/textures/sponza_arch_spec.png b/models/Sponza/textures/sponza_arch_spec.png new file mode 100644 index 000000000..4c9e184e1 Binary files /dev/null and b/models/Sponza/textures/sponza_arch_spec.png differ diff --git a/models/Sponza/textures/sponza_ceiling_a_diff.png b/models/Sponza/textures/sponza_ceiling_a_diff.png new file mode 100644 index 000000000..bd0d834cd Binary files /dev/null and b/models/Sponza/textures/sponza_ceiling_a_diff.png differ diff --git a/models/Sponza/textures/sponza_ceiling_a_diff_NRM.png b/models/Sponza/textures/sponza_ceiling_a_diff_NRM.png new file mode 100644 index 000000000..ba859158e Binary files /dev/null and b/models/Sponza/textures/sponza_ceiling_a_diff_NRM.png differ diff --git a/models/Sponza/textures/sponza_ceiling_a_spec.png b/models/Sponza/textures/sponza_ceiling_a_spec.png new file mode 100644 index 000000000..55523e968 Binary files /dev/null and b/models/Sponza/textures/sponza_ceiling_a_spec.png differ diff --git a/models/Sponza/textures/sponza_column_a_bump.png b/models/Sponza/textures/sponza_column_a_bump.png new file mode 100644 index 000000000..056ff4b61 Binary files /dev/null and b/models/Sponza/textures/sponza_column_a_bump.png differ diff --git a/models/Sponza/textures/sponza_column_a_ddn.png b/models/Sponza/textures/sponza_column_a_ddn.png new file mode 100644 index 000000000..418cfa5d4 Binary files /dev/null and b/models/Sponza/textures/sponza_column_a_ddn.png differ diff --git a/models/Sponza/textures/sponza_column_a_diff.png b/models/Sponza/textures/sponza_column_a_diff.png new file mode 100644 index 000000000..c0ec68c0a Binary files /dev/null and b/models/Sponza/textures/sponza_column_a_diff.png differ diff --git a/models/Sponza/textures/sponza_column_a_spec.png b/models/Sponza/textures/sponza_column_a_spec.png new file mode 100644 index 000000000..e73f40697 Binary files /dev/null and b/models/Sponza/textures/sponza_column_a_spec.png differ diff --git a/models/Sponza/textures/sponza_column_b_bump.png b/models/Sponza/textures/sponza_column_b_bump.png new file mode 100644 index 000000000..cca7fa6b7 Binary files /dev/null and b/models/Sponza/textures/sponza_column_b_bump.png differ diff --git a/models/Sponza/textures/sponza_column_b_ddn.png b/models/Sponza/textures/sponza_column_b_ddn.png new file mode 100644 index 000000000..e349b986e Binary files /dev/null and b/models/Sponza/textures/sponza_column_b_ddn.png differ diff --git a/models/Sponza/textures/sponza_column_b_diff.png b/models/Sponza/textures/sponza_column_b_diff.png new file mode 100644 index 000000000..7fbf0d97f Binary files /dev/null and b/models/Sponza/textures/sponza_column_b_diff.png differ diff --git a/models/Sponza/textures/sponza_column_b_spec.png b/models/Sponza/textures/sponza_column_b_spec.png new file mode 100644 index 000000000..b9b34ccde Binary files /dev/null and b/models/Sponza/textures/sponza_column_b_spec.png differ diff --git a/models/Sponza/textures/sponza_column_c_bump.png b/models/Sponza/textures/sponza_column_c_bump.png new file mode 100644 index 000000000..c07cbf616 Binary files /dev/null and b/models/Sponza/textures/sponza_column_c_bump.png differ diff --git a/models/Sponza/textures/sponza_column_c_ddn.png b/models/Sponza/textures/sponza_column_c_ddn.png new file mode 100644 index 000000000..7e04a6b78 Binary files /dev/null and b/models/Sponza/textures/sponza_column_c_ddn.png differ diff --git a/models/Sponza/textures/sponza_column_c_diff.png b/models/Sponza/textures/sponza_column_c_diff.png new file mode 100644 index 000000000..ea6b42b9a Binary files /dev/null and b/models/Sponza/textures/sponza_column_c_diff.png differ diff --git a/models/Sponza/textures/sponza_column_c_spec.png b/models/Sponza/textures/sponza_column_c_spec.png new file mode 100644 index 000000000..bf2ddee34 Binary files /dev/null and b/models/Sponza/textures/sponza_column_c_spec.png differ diff --git a/models/Sponza/textures/sponza_curtain_blue_diff.png b/models/Sponza/textures/sponza_curtain_blue_diff.png new file mode 100644 index 000000000..31df2a9d9 Binary files /dev/null and b/models/Sponza/textures/sponza_curtain_blue_diff.png differ diff --git a/models/Sponza/textures/sponza_curtain_blue_diff_NRM.png b/models/Sponza/textures/sponza_curtain_blue_diff_NRM.png new file mode 100644 index 000000000..3dac0f4f0 Binary files /dev/null and b/models/Sponza/textures/sponza_curtain_blue_diff_NRM.png differ diff --git a/models/Sponza/textures/sponza_curtain_diff.png b/models/Sponza/textures/sponza_curtain_diff.png new file mode 100644 index 000000000..5924985ca Binary files /dev/null and b/models/Sponza/textures/sponza_curtain_diff.png differ diff --git a/models/Sponza/textures/sponza_curtain_green_diff.png b/models/Sponza/textures/sponza_curtain_green_diff.png new file mode 100644 index 000000000..69b0efeb6 Binary files /dev/null and b/models/Sponza/textures/sponza_curtain_green_diff.png differ diff --git a/models/Sponza/textures/sponza_details_diff.png b/models/Sponza/textures/sponza_details_diff.png new file mode 100644 index 000000000..95d91030e Binary files /dev/null and b/models/Sponza/textures/sponza_details_diff.png differ diff --git a/models/Sponza/textures/sponza_details_diff_NRM.png b/models/Sponza/textures/sponza_details_diff_NRM.png new file mode 100644 index 000000000..41a5f3add Binary files /dev/null and b/models/Sponza/textures/sponza_details_diff_NRM.png differ diff --git a/models/Sponza/textures/sponza_details_spec.png b/models/Sponza/textures/sponza_details_spec.png new file mode 100644 index 000000000..b26b54000 Binary files /dev/null and b/models/Sponza/textures/sponza_details_spec.png differ diff --git a/models/Sponza/textures/sponza_fabric_blue_diff.png b/models/Sponza/textures/sponza_fabric_blue_diff.png new file mode 100644 index 000000000..398dc412b Binary files /dev/null and b/models/Sponza/textures/sponza_fabric_blue_diff.png differ diff --git a/models/Sponza/textures/sponza_fabric_blue_diff_NRM.png b/models/Sponza/textures/sponza_fabric_blue_diff_NRM.png new file mode 100644 index 000000000..a2e8a0866 Binary files /dev/null and b/models/Sponza/textures/sponza_fabric_blue_diff_NRM.png differ diff --git a/models/Sponza/textures/sponza_fabric_diff.png b/models/Sponza/textures/sponza_fabric_diff.png new file mode 100644 index 000000000..77ec73724 Binary files /dev/null and b/models/Sponza/textures/sponza_fabric_diff.png differ diff --git a/models/Sponza/textures/sponza_fabric_green_diff.png b/models/Sponza/textures/sponza_fabric_green_diff.png new file mode 100644 index 000000000..34702c143 Binary files /dev/null and b/models/Sponza/textures/sponza_fabric_green_diff.png differ diff --git a/models/Sponza/textures/sponza_fabric_spec.png b/models/Sponza/textures/sponza_fabric_spec.png new file mode 100644 index 000000000..c41590972 Binary files /dev/null and b/models/Sponza/textures/sponza_fabric_spec.png differ diff --git a/models/Sponza/textures/sponza_flagpole_diff.png b/models/Sponza/textures/sponza_flagpole_diff.png new file mode 100644 index 000000000..98300634d Binary files /dev/null and b/models/Sponza/textures/sponza_flagpole_diff.png differ diff --git a/models/Sponza/textures/sponza_flagpole_diff_NRM.png b/models/Sponza/textures/sponza_flagpole_diff_NRM.png new file mode 100644 index 000000000..d34872f90 Binary files /dev/null and b/models/Sponza/textures/sponza_flagpole_diff_NRM.png differ diff --git a/models/Sponza/textures/sponza_flagpole_spec.png b/models/Sponza/textures/sponza_flagpole_spec.png new file mode 100644 index 000000000..00e4bd289 Binary files /dev/null and b/models/Sponza/textures/sponza_flagpole_spec.png differ diff --git a/models/Sponza/textures/sponza_floor_a_diff.png b/models/Sponza/textures/sponza_floor_a_diff.png new file mode 100644 index 000000000..fd256aa6f Binary files /dev/null and b/models/Sponza/textures/sponza_floor_a_diff.png differ diff --git a/models/Sponza/textures/sponza_floor_a_diff_NRM.png b/models/Sponza/textures/sponza_floor_a_diff_NRM.png new file mode 100644 index 000000000..093abb618 Binary files /dev/null and b/models/Sponza/textures/sponza_floor_a_diff_NRM.png differ diff --git a/models/Sponza/textures/sponza_floor_a_spec.png b/models/Sponza/textures/sponza_floor_a_spec.png new file mode 100644 index 000000000..61b90a73a Binary files /dev/null and b/models/Sponza/textures/sponza_floor_a_spec.png differ diff --git a/models/Sponza/textures/sponza_roof_diff.png b/models/Sponza/textures/sponza_roof_diff.png new file mode 100644 index 000000000..99168cbfd Binary files /dev/null and b/models/Sponza/textures/sponza_roof_diff.png differ diff --git a/models/Sponza/textures/sponza_roof_diff_NRM.png b/models/Sponza/textures/sponza_roof_diff_NRM.png new file mode 100644 index 000000000..5e488bbe6 Binary files /dev/null and b/models/Sponza/textures/sponza_roof_diff_NRM.png differ diff --git a/models/Sponza/textures/sponza_thorn_bump.png b/models/Sponza/textures/sponza_thorn_bump.png new file mode 100644 index 000000000..a0d1f8ea9 Binary files /dev/null and b/models/Sponza/textures/sponza_thorn_bump.png differ diff --git a/models/Sponza/textures/sponza_thorn_ddn.png b/models/Sponza/textures/sponza_thorn_ddn.png new file mode 100644 index 000000000..83ca2d7a0 Binary files /dev/null and b/models/Sponza/textures/sponza_thorn_ddn.png differ diff --git a/models/Sponza/textures/sponza_thorn_diff.png b/models/Sponza/textures/sponza_thorn_diff.png new file mode 100644 index 000000000..c08ff6d72 Binary files /dev/null and b/models/Sponza/textures/sponza_thorn_diff.png differ diff --git a/models/Sponza/textures/sponza_thorn_mask.png b/models/Sponza/textures/sponza_thorn_mask.png new file mode 100644 index 000000000..8529de359 Binary files /dev/null and b/models/Sponza/textures/sponza_thorn_mask.png differ diff --git a/models/Sponza/textures/sponza_thorn_spec.png b/models/Sponza/textures/sponza_thorn_spec.png new file mode 100644 index 000000000..dfd5c8109 Binary files /dev/null and b/models/Sponza/textures/sponza_thorn_spec.png differ diff --git a/models/Sponza/textures/vase_bump.png b/models/Sponza/textures/vase_bump.png new file mode 100644 index 000000000..1c1898403 Binary files /dev/null and b/models/Sponza/textures/vase_bump.png differ diff --git a/models/Sponza/textures/vase_ddn.png b/models/Sponza/textures/vase_ddn.png new file mode 100644 index 000000000..0f2ad7b23 Binary files /dev/null and b/models/Sponza/textures/vase_ddn.png differ diff --git a/models/Sponza/textures/vase_dif.png b/models/Sponza/textures/vase_dif.png new file mode 100644 index 000000000..22f0284d9 Binary files /dev/null and b/models/Sponza/textures/vase_dif.png differ diff --git a/models/Sponza/textures/vase_hanging.png b/models/Sponza/textures/vase_hanging.png new file mode 100644 index 000000000..546782f34 Binary files /dev/null and b/models/Sponza/textures/vase_hanging.png differ diff --git a/models/Sponza/textures/vase_hanging_NRM.png b/models/Sponza/textures/vase_hanging_NRM.png new file mode 100644 index 000000000..194f4d1f4 Binary files /dev/null and b/models/Sponza/textures/vase_hanging_NRM.png differ diff --git a/models/Sponza/textures/vase_plant.png b/models/Sponza/textures/vase_plant.png new file mode 100644 index 000000000..f083c96c1 Binary files /dev/null and b/models/Sponza/textures/vase_plant.png differ diff --git a/models/Sponza/textures/vase_plant_NRM.png b/models/Sponza/textures/vase_plant_NRM.png new file mode 100644 index 000000000..9d938afd9 Binary files /dev/null and b/models/Sponza/textures/vase_plant_NRM.png differ diff --git a/models/Sponza/textures/vase_plant_mask.png b/models/Sponza/textures/vase_plant_mask.png new file mode 100644 index 000000000..a3d4ba507 Binary files /dev/null and b/models/Sponza/textures/vase_plant_mask.png differ diff --git a/models/Sponza/textures/vase_plant_spec.png b/models/Sponza/textures/vase_plant_spec.png new file mode 100644 index 000000000..2e4dbdb75 Binary files /dev/null and b/models/Sponza/textures/vase_plant_spec.png differ diff --git a/models/Sponza/textures/vase_round.png b/models/Sponza/textures/vase_round.png new file mode 100644 index 000000000..14b360a07 Binary files /dev/null and b/models/Sponza/textures/vase_round.png differ diff --git a/models/Sponza/textures/vase_round_bump.png b/models/Sponza/textures/vase_round_bump.png new file mode 100644 index 000000000..8b481c081 Binary files /dev/null and b/models/Sponza/textures/vase_round_bump.png differ diff --git a/models/Sponza/textures/vase_round_ddn.png b/models/Sponza/textures/vase_round_ddn.png new file mode 100644 index 000000000..d06e2a8aa Binary files /dev/null and b/models/Sponza/textures/vase_round_ddn.png differ diff --git a/models/Sponza/textures/vase_round_spec.png b/models/Sponza/textures/vase_round_spec.png new file mode 100644 index 000000000..dfe0b52bc Binary files /dev/null and b/models/Sponza/textures/vase_round_spec.png differ