zhanshi/mekhanoidy-tools
1
0
Fork 0
mirror of https://github.com/aimrebirth/tools.git synced 2026-04-15 01:43:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Better .obj offsets for different groups.

Browse source
This commit is contained in:
lzwdgc 2020-03-06 14:04:15 +03:00
parent 1011a80add
commit 0265eb5e89
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/model/model.cpp
View file

@ -321,7 +321,7 @@ static std::string printTex(const uv &texture_coordinates)
return s; return s;
} }
std::string processed_model_data::print(int group_offset, AxisSystem as) const std::string processed_model_data::print(int v_offset, int n_offset, int uv_offset, AxisSystem as) const
{ {
std::string s; std::string s;
@ -352,11 +352,11 @@ std::string processed_model_data::print(int group_offset, AxisSystem as) const
for (auto &v : t.points) for (auto &v : t.points)
{ {
std::string x; std::string x;
x += std::to_string(v.vertex + 1 + group_offset); x += std::to_string(v.vertex + 1 + v_offset);
x += "/"; x += "/";
x += std::to_string(v.uv + 1 + group_offset); // uv goes second in .obj x += std::to_string(v.uv + 1 + uv_offset); // uv goes second in .obj
x += "/"; x += "/";
x += std::to_string(v.normal + 1 + group_offset); x += std::to_string(v.normal + 1 + n_offset);
s += x + " "; s += x + " ";
} }
s += "\n"; s += "\n";
@ -392,7 +392,7 @@ static processed_model_data process_block(const model_data &d)
return pmd; return pmd;
} }
std::string block::printObj(int group_offset, AxisSystem as) const std::string block::printObj(int v_offset, int n_offset, int uv_offset, AxisSystem as) const
{ {
std::string s; std::string s;
s += "usemtl " + h.name + "\n"; s += "usemtl " + h.name + "\n";
@ -401,7 +401,7 @@ std::string block::printObj(int group_offset, AxisSystem as) const
s += "s 1\n"; // still unk how to use s += "s 1\n"; // still unk how to use
s += "\n"; s += "\n";
s += pmd.print(group_offset, as); s += pmd.print(v_offset, n_offset, uv_offset, as);
return s; return s;
} }
@ -764,14 +764,18 @@ void model::print(const std::string &fn, AxisSystem as) const
title(o); title(o);
o << "mtllib " + fn + ".mtl\n\n"; o << "mtllib " + fn + ".mtl\n\n";
o << "o " << fn << "\n\n"; o << "o " << fn << "\n\n";
int n_vert = 0; int v_offset = 0;
int n_offset = 0;
int uv_offset = 0;
for (auto &b : blocks) for (auto &b : blocks)
{ {
if (!b.canPrint()) if (!b.canPrint())
continue; continue;
o << b.printObj(n_vert, as) << "\n"; o << b.printObj(v_offset, n_offset, uv_offset, as) << "\n";
n_vert += b.md.vertices.size(); v_offset += b.pmd.vertices.size();
n_offset += b.pmd.normals.size();
uv_offset += b.pmd.uvs.size();
} }
}; };

4
src/model/model.h
View file

@ -184,7 +184,7 @@ struct processed_model_data
std::vector<uv> uvs; std::vector<uv> uvs;
std::vector<face> faces; std::vector<face> faces;
std::string print(int group_offset, AxisSystem as) const; std::string print(int v_offset, int n_offset, int uv_offset, AxisSystem as) const;
}; };
struct animation struct animation
@ -346,7 +346,7 @@ struct block
void linkFaces(); void linkFaces();
std::string printMtl() const; std::string printMtl() const;
std::string printObj(int group_offset, AxisSystem as) const; std::string printObj(int v_offset, int n_offset, int uv_offset, AxisSystem as) const;
block_info save(yaml &root) const; block_info save(yaml &root) const;
bool canPrint() const; bool canPrint() const;