mirror/openlara
1
0
Fork 0
mirror of https://github.com/XProger/OpenLara.git synced 2025-04-21 03:21:51 +02:00
Code Issues Releases Wiki Activity

#12 fix normals

Browse Source
This commit is contained in:
XProger 2016-10-21 02:48:52 +03:00
parent df942b2893
commit bb9b3963d2
2 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
bin/OpenLara.exe
View File

Binary file not shown.

28
src/mesh.h
View File

@ -198,7 +198,7 @@ struct MeshBuilder {
TR::Room::Data::Vertex &v = d.vertices[f.vertices[k]];
uint8 a = 255 - (v.lighting >> 5);
vertices[vCount].coord = { v.vertex.x, v.vertex.y, v.vertex.z };
vertices[vCount].coord = { v.vertex.x, v.vertex.y, v.vertex.z, 0 };
vertices[vCount].color = { a, a, a, 255 };
vertices[vCount].normal = { 0, 0, 0, 1 };
vCount++;
@ -215,7 +215,7 @@ struct MeshBuilder {
auto &v = d.vertices[f.vertices[k]];
uint8 a = 255 - (v.lighting >> 5);
vertices[vCount].coord = { v.vertex.x, v.vertex.y, v.vertex.z };
vertices[vCount].coord = { v.vertex.x, v.vertex.y, v.vertex.z, 0 };
vertices[vCount].color = { a, a, a, 255 };
vertices[vCount].normal = { 0, 0, 0, 1 };
vCount++;
@ -272,11 +272,14 @@ struct MeshBuilder {
for (int k = 0; k < 4; k++) {
auto &v = mVertices[f.vertices[k]];
vertices[vCount].coord = { v.x, v.y, v.z };
vertices[vCount].coord = { v.x, v.y, v.z, 0 };
if (nCount > 0) {
TR::Vertex &n = normals[f.vertices[k]];
vertices[vCount].normal = { n.x, n.y, n.z, 0 };
if (n.x | n.y | n.z)
vertices[vCount].normal = { n.x, n.y, n.z, 0 };
else
vertices[vCount].normal = vertices[vCount].coord;
vertices[vCount].color = { 255, 255, 255, 255 };
} else {
uint8 a = 255 - (lights[f.vertices[k]] >> 5);
@ -297,11 +300,14 @@ struct MeshBuilder {
for (int k = 0; k < 3; k++) {
auto &v = mVertices[f.vertices[k]];
vertices[vCount].coord = { v.x, v.y, v.z };
vertices[vCount].coord = { v.x, v.y, v.z, 0 };
if (nCount > 0) {
TR::Vertex &n = normals[f.vertices[k]];
vertices[vCount].normal = { n.x, n.y, n.z, 0 };
if (n.x | n.y | n.z)
vertices[vCount].normal = { n.x, n.y, n.z, 0 };
else
vertices[vCount].normal = vertices[vCount].coord;
vertices[vCount].color = { 255, 255, 255, 255 };
} else {
uint8 a = 255 - (lights[f.vertices[k]] >> 5);
@ -327,7 +333,10 @@ struct MeshBuilder {
if (nCount > 0) {
TR::Vertex &n = normals[f.vertices[k]];
vertices[vCount].normal = { n.x, n.y, n.z, 0 };
if (n.x | n.y | n.z)
vertices[vCount].normal = { n.x, n.y, n.z, 0 };
else
vertices[vCount].normal = vertices[vCount].coord;
vertices[vCount].color = { c.r, c.g, c.b, 255 };
} else {
uint8 a = 255 - (lights[f.vertices[k]] >> 5);
@ -353,7 +362,10 @@ struct MeshBuilder {
if (nCount > 0) {
TR::Vertex &n = normals[f.vertices[k]];
vertices[vCount].normal = { n.x, n.y, n.z, 0 };
if (n.x | n.y | n.z)
vertices[vCount].normal = { n.x, n.y, n.z, 0 };
else
vertices[vCount].normal = vertices[vCount].coord;
vertices[vCount].color = { c.r, c.g, c.b, 255 };
} else {
uint8 a = 255 - (lights[f.vertices[k]] >> 5);