Pantyhose-X
/
vengi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

VOXELFORMAT: sample the center of the texel to fix border bleeding in obj exports

master
Martin Gerhardy 2020-09-30 23:12:25 +02:00
parent c85e9b2fee
commit 765a216c52
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -1,6 +1,7 @@
vengi (0.0.9.0-1) UNRELEASED; urgency=low
* Empty
* General:
* Added obj texcoord export sampling the borders of the texel
-- Martin Gerhardy <martin.gerhardy@gmail.com> Wed, 30 Sep 2020 22:38:13 +0200

4
docs/CHANGELOG.md
View File

@ -4,6 +4,10 @@ A more detailed changelog can be found on [github](https://github.com/mgerhardy/
## 0.0.9 (2020-XX-XX)
General:
- Added obj texcoord export sampling the borders of the texel
## 0.0.8 (2020-09-30)
General:

24
src/modules/voxelformat/OBJFormat.cpp
View File

@ -54,8 +54,8 @@ bool OBJFormat::saveMesh(const voxel::Mesh& mesh, const io::FilePtr &file, float
// 1 x 256 is the texture format that we are using for our palette
const float texcoord = 1.0f / (float)colors.size();
// it is only 1 pixel high
const float v1 = 0.0f;
const float v2 = 1.0f;
const float v1 = 0.5f;
const float v2 = 0.5f;
stream.addStringFormat(false, "# github.com/mgerhardy/engine\n");
stream.addStringFormat(false, "\n");
@ -78,12 +78,11 @@ bool OBJFormat::saveMesh(const voxel::Mesh& mesh, const io::FilePtr &file, float
if (quad) {
for (int i = 0; i < ni; i += 6) {
const voxel::VoxelVertex& v = vertices[indices[i]];
const float u1 = (float)v.colorIndex * texcoord;
const float u2 = (float)(v.colorIndex + 1) * texcoord;
stream.addStringFormat(false, "vt %f %f\n", u1, v1);
stream.addStringFormat(false, "vt %f %f\n", u2, v1);
stream.addStringFormat(false, "vt %f %f\n", u2, v2);
stream.addStringFormat(false, "vt %f %f\n", u1, v2);
const float u = ((float)(v.colorIndex) + 0.5f) * texcoord;
stream.addStringFormat(false, "vt %f %f\n", u, v1);
stream.addStringFormat(false, "vt %f %f\n", u, v1);
stream.addStringFormat(false, "vt %f %f\n", u, v2);
stream.addStringFormat(false, "vt %f %f\n", u, v2);
}
int uvi = 0;
@ -98,11 +97,10 @@ bool OBJFormat::saveMesh(const voxel::Mesh& mesh, const io::FilePtr &file, float
} else {
for (int i = 0; i < ni; i += 3) {
const voxel::VoxelVertex& v = vertices[indices[i]];
const float u1 = (float)v.colorIndex * texcoord;
const float u2 = (float)(v.colorIndex + 1) * texcoord;
stream.addStringFormat(false, "vt %f %f\n", u1, v1);
stream.addStringFormat(false, "vt %f %f\n", u2, v1);
stream.addStringFormat(false, "vt %f %f\n", u2, v2);
const float u = ((float)(v.colorIndex) + 0.5f) * texcoord;
stream.addStringFormat(false, "vt %f %f\n", u, v1);
stream.addStringFormat(false, "vt %f %f\n", u, v1);
stream.addStringFormat(false, "vt %f %f\n", u, v2);
}
for (int i = 0; i < ni; i += 3) {