Fix mipmapping regression #98
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Derpius
reviewed
Nov 9, 2024
source/objects/Model.cpp
Outdated
| @@ -94,7 +101,7 @@ Mesh::Mesh( | |||
| tri.tangents[j] = glm::normalize(glm::vec3(tri.e1[0], tri.e1[1], tri.e1[2])); | |||
| } | |||
|
|
|||
| tri.uvs[j] = glm::vec2(verts[j]->texCoord.x, verts[j]->texCoord.y); | |||
| tri.uvs[j] = uvs[j]; | |||
There was a problem hiding this comment.
this shouldn't be needed now that it's passed to the constructor right?
source/objects/Primitives.h
Outdated
| const bool oneSided = false | ||
| ) : p0(p0), e1(p0 - p1), e2(p2 - p0), material(material), oneSided(oneSided) | ||
| ) : p0(p0), e1(p0 - p1), e2(p2 - p0), material(material), uvs(), oneSided(oneSided) |
There was a problem hiding this comment.
is this empty initialisation doing anything?
Comment on lines
413
to
415
| memcpy(tri.normals, normals + vi0, sizeof(glm::vec3) * 3); | ||
| memcpy(tri.tangents, tangents + vi0, sizeof(glm::vec3) * 3); | ||
| memcpy(tri.uvs, uvs + vi0, sizeof(glm::vec2) * 3); | ||
| memcpy(tri.alphas, alphas + vi0, sizeof(float) * 3); |
There was a problem hiding this comment.
Would be ideal to pass the other data in via the constructor too, but not gonna make you do that
|
No idea why the build is failing now due to vcpkg (the repository has never used it) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #96
PR Type (tick all that are applicable)
Tested Targets (only applicable for changes to the binary module, delete otherwise)
Checklist
Description
Properly passes the UVs of any world/model triangle into the
TriangleBackfaceCullclass so that the data is intact once it callsComputeNormalAndLoD()