Skip to content

Avkhokhlov/material saving #199

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

Open
wants to merge 14 commits into
base: master
Choose a base branch
from
Open

Avkhokhlov/material saving #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ed20555
Added button for material saving
Sep 21, 2018
f513ab1
Fixed load/save texture for material saving
Sep 21, 2018
fd7d9c5
Fix linux build
Sep 24, 2018
a26efce
Fix for old GNU compiler
Sep 25, 2018
2bf5f7d
Yet another fix for old compilers
Sep 25, 2018
b1abedb
YAF for ubuntu
Sep 25, 2018
15a4724
YEF ios
Sep 25, 2018
80fea17
filesystem moved from DataGenerator itno BaikalIO
Sep 27, 2018
74a8d65
yet another try to launch this on OSX
Sep 27, 2018
db476fb
YEAF for apple
Sep 27, 2018
b08d11d
YEAF for apple, added macors for clang in filesystem
Sep 28, 2018
ee6fb12
added stdc++fs for clang
Sep 28, 2018
684860a
one more try
Sep 28, 2018
3fba13a
Merge with master
Nov 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions BaikalIO/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ set(SOURCES
scene_io.h
scene_test_io.cpp
scene_obj_io.cpp
filesystem.h
)

if (UNIX AND NOT APPLE)
Expand All @@ -25,13 +26,18 @@ endif (BAIKAL_ENABLE_FBX)
add_library(BaikalIO SHARED ${SOURCES})

target_compile_definitions(BaikalIO PRIVATE BAIKAL_EXPORT_API)
target_compile_features(BaikalIO PRIVATE cxx_std_14)
target_compile_features(BaikalIO PRIVATE cxx_std_17)
target_link_libraries(BaikalIO PUBLIC Baikal OpenImageIO::OpenImageIO)

if (UNIX AND NOT APPLE)
if (UNIX OR APPLE)
target_link_libraries(BaikalIO PUBLIC stdc++fs)
endif ()

if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -lstdc++fs -lc++experimental")
target_compile_options(BaikalIO PUBLIC -stdlib=libc++)
endif()

target_include_directories(BaikalIO PUBLIC "${Baikal_SOURCE_DIR}/BaikalIO" "${Baikal_SOURCE_DIR}/3rdparty/tinyobjloader/include")

if (BAIKAL_ENABLE_FBX)
Expand Down
7 changes: 6 additions & 1 deletion BaikalDataGenerator/Source/filesystem.h → BaikalIO/filesystem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#if (defined(__GNUC__) && (__GNUC__ < 8))
#if (defined(__GNUC__) && (__GNUC__ < 8)) || (defined(__clang__) && (__clang_major__ < 7))
#include <experimental/filesystem>
#else
#include <filesystem>
Expand All @@ -16,4 +16,9 @@ namespace std
{
namespace filesystem = experimental::filesystem::v1;
}
#elif (defined(__clang__))
namespace std
{
namespace filesystem = experimental::filesystem;
}
#endif
9 changes: 5 additions & 4 deletions BaikalIO/material_io.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
#include "SceneGraph/uberv2material.h"
#include "SceneGraph/inputmaps.h"

#include "filesystem.h"
#include "image_io.h"

#include "XML/tinyxml2.h"
Expand Down Expand Up @@ -486,18 +487,18 @@ namespace Baikal
}
else
{
std::string texture_name = texture->GetName();
std::filesystem::path texture_name = texture->GetName();
if (texture_name.empty())
{
std::ostringstream oss;
oss << (std::uint64_t)texture.get() << ".jpg";
texture_name = oss.str();
io.SaveImage(m_base_path + texture_name, texture);
io.SaveImage(m_base_path + texture_name.string(), texture);
}

m_tex2name[texture] = texture_name;
m_tex2name[texture] = texture_name.filename().string();

printer.PushAttribute("value", texture_name.c_str());
printer.PushAttribute("value", m_tex2name[texture].c_str());
}
printer.CloseElement();
break;
Expand Down
7 changes: 7 additions & 0 deletions BaikalStandalone/Application/application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -918,6 +918,13 @@ namespace Baikal
}
}

if (ImGui::Button("Save materials"))
{
auto material_io = Baikal::MaterialIo::CreateMaterialIoXML();
material_io->SaveMaterialsFromScene(m_settings.path + "/materials.xml", *m_cl->GetScene());
material_io->SaveIdentityMapping(m_settings.path + "/mapping.xml", *m_cl->GetScene());
}

if (m_settings.time_benchmark && m_settings.samplecount > 511)
{
m_settings.time_benchmark = false;
Expand Down