Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src/model
diff options
context:
space:
mode:
Diffstat (limited to 'src/model')
-rw-r--r--src/model/mapfile.cc12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/model/mapfile.cc b/src/model/mapfile.cc
index deb22a5..f57106d 100644
--- a/src/model/mapfile.cc
+++ b/src/model/mapfile.cc
@@ -328,6 +328,7 @@ bool MapFile::read_patchdef()
}
patchvertices[r][c].assign(x, y, z);
+ patchvertices[r][c] *= SCALE;
}
if (!(linestream >> word)) {
@@ -390,12 +391,13 @@ bool MapFile::read_patchdef()
// TODO triangulate, assign texture coordinates
for (size_t r = 0; r < rows-1; r++) {
for (size_t c = 0; c < columns -1; c++) {
+ // unwind face counter-clockwise
Quad *quad = new Quad(
- patchvertices[r][c] * SCALE,
- patchvertices[r][c+1] * SCALE,
- patchvertices[r+1][c+1] * SCALE,
- patchvertices[r+1][c] * SCALE,
- math::normal(patchvertices[r][c], patchvertices[r][c+1], patchvertices[r+1][c+1])
+ patchvertices[r+1][c+1],
+ patchvertices[r][c+1],
+ patchvertices[r][c],
+ patchvertices[r+1][c],
+ math::normal(patchvertices[r][c+1], patchvertices[r][c], patchvertices[r+1][c+1])
);
primitives->add_quad(quad);
}