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

adapt to current file stream API from voxel-io #7

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

adapt to current file stream API from voxel-io #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 7 additions & 6 deletions src/io.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "voxelio/format/vox.hpp"
#include "voxelio/format/xyzrgb.hpp"

#include "voxelio/fstream.hpp"
#include "voxelio/filetype.hpp"
#include "voxelio/log.hpp"
#include "voxelio/stream.hpp"
Expand Down Expand Up @@ -44,8 +45,8 @@ void writeTriangleAsBinaryToDebugStl(Triangle triangle)
void dumpDebugStl(const std::string &path)
{
u8 buffer[80]{};
std::optional<FileOutputStream> stlDump = FileOutputStream::open(path);
VXIO_ASSERT(stlDump.has_value());
std::optional<FileOutputStream> stlDump = FileOutputStream(path, OpenMode::WRITE);
VXIO_ASSERT(stlDump->good());
stlDump->write(buffer, sizeof(buffer));
VXIO_ASSERT_DIVISIBLE(globalDebugStl.size(), 50u);
stlDump->writeLittle<u32>(static_cast<u32>(globalDebugStl.size() / 50));
Expand Down Expand Up @@ -394,8 +395,8 @@ std::unique_ptr<ITriangleStream> ITriangleStream::fromObjFile(const std::string

std::unique_ptr<ITriangleStream> ITriangleStream::fromStlFile(const std::string &inFile) noexcept
{
std::optional<FileInputStream> stream = FileInputStream::open(inFile);
if (not stream.has_value()) {
std::optional<FileInputStream> stream = FileInputStream(inFile, OpenMode::READ);
if (not stream->good()) {
VXIO_LOG(ERROR, "Failed to open STL file: \"" + inFile + "\"");
return nullptr;
}
Expand Down Expand Up @@ -438,8 +439,8 @@ std::optional<Texture> loadTexture(const std::string &name, const std::string &m
{
std::string sanitizedName = name;
std::replace(sanitizedName.begin(), sanitizedName.end(), '\\', '/');
std::optional<FileInputStream> stream = FileInputStream::open(sanitizedName, OpenMode::BINARY);
if (not stream.has_value()) {
std::optional<FileInputStream> stream = FileInputStream(sanitizedName, OpenMode::BINARY);
if (not stream->good()) {
VXIO_LOG(WARNING, "Failed to open texture file \"" + sanitizedName + "\" of material \"" + material + '"');
return std::nullopt;
}
Expand Down
9 changes: 5 additions & 4 deletions src/obj2voxel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include "voxelization.hpp"

#include "voxelio/format/png.hpp"
#include "voxelio/fstream.hpp"
#include "voxelio/stringify.hpp"

#include <atomic>
Expand Down Expand Up @@ -556,8 +557,8 @@ std::unique_ptr<IVoxelSink> openOutput(obj2voxel_instance &instance)
}

case IoType::FILE: {
std::optional<FileOutputStream> stream = FileOutputStream::open(output.file.path, OpenMode::BINARY);
if (not stream.has_value()) {
std::optional<FileOutputStream> stream = FileOutputStream(output.file.path, OpenMode::BINARY);
if (not stream->good()) {
return nullptr;
}

Expand Down Expand Up @@ -873,8 +874,8 @@ bool obj2voxel_texture_load_from_file(obj2voxel_texture *texture, const char *fi
return false;
}

std::optional<FileInputStream> fileStream = FileInputStream::open(file, OpenMode::BINARY);
if (not fileStream.has_value()) {
std::optional<FileInputStream> fileStream = FileInputStream(file, OpenMode::BINARY);
if (not fileStream->good()) {
return false;
}
std::string error;
Expand Down