Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source
This commit is contained in:
kervala 2017-01-03 13:43:52 +01:00
parent 7d608488cd
commit a5c5726601
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
code/nel/tools/3d/textures_tool/main.cpp
View file

@ -312,7 +312,8 @@ int main(int argc, char **argv)
NLMISC::fromString(tokens[1], u); NLMISC::fromString(tokens[1], u);
NLMISC::fromString(tokens[2], v); NLMISC::fromString(tokens[2], v);
verticeTextureCoords.push_back(NLMISC::CUV(u * (float)TextureSize, v * (float)TextureSize)); // V coordinates are inverted
verticeTextureCoords.push_back(NLMISC::CUV(u * (float)TextureSize, (1.f - v) * (float)TextureSize));
} }
else else
{ {
@ -377,12 +378,20 @@ int main(int argc, char **argv)
NLMISC::CUV uv1 = verticeTextureCoords[face.indices[1]]; NLMISC::CUV uv1 = verticeTextureCoords[face.indices[1]];
NLMISC::CUV uv2 = verticeTextureCoords[face.indices[2]]; NLMISC::CUV uv2 = verticeTextureCoords[face.indices[2]];
std::vector<std::pair<sint, sint> > pixels; std::vector<std::pair<sint, sint> > pixels, temp;
// draw the triangle with vertices UV coordinates // draw the triangle with vertices UV coordinates
NLMISC::drawLine(uv0.U, uv0.V, uv1.U, uv1.V, pixels); NLMISC::drawFullLine(uv0.U, uv0.V, uv1.U, uv1.V, pixels);
NLMISC::drawLine(uv1.U, uv1.V, uv2.U, uv2.V, pixels);
NLMISC::drawLine(uv2.U, uv2.V, uv0.U, uv0.V, pixels); // append pixels
NLMISC::drawFullLine(uv1.U, uv1.V, uv2.U, uv2.V, temp);
pixels.reserve(pixels.size() + temp.size());
pixels.insert(pixels.end(), temp.begin(), temp.end());
// append pixels
NLMISC::drawFullLine(uv2.U, uv2.V, uv0.U, uv0.V, temp);
pixels.reserve(pixels.size() + temp.size());
pixels.insert(pixels.end(), temp.begin(), temp.end());
// for each pixels, set them to black // for each pixels, set them to black
for (uint j = 0, jlen = pixels.size(); j < jlen; ++j) for (uint j = 0, jlen = pixels.size(); j < jlen; ++j)