Some update to gltf loading #4373
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
Only warns when there are more animations than currently implemented Allows mesh indices to be unsigned char
HarryDC
commented
Oct 8, 2024
| #define LOAD_ATTRIBUTE(accesor, numComp, dataType, dstPtr) \ | ||
| #define LOAD_ATTRIBUTE(accesor, numComp, srcType, dstPtr) LOAD_ATTRIBUTE_CAST(accesor, numComp, srcType, dstPtr, srcType) | ||
|
|
||
| #define LOAD_ATTRIBUTE_CAST(accesor, numComp, srcType, dstPtr, dstType) \ |
There was a problem hiding this comment.
@raysan5 mention in discord this would have to change to include something like
if (dstPtr == NULL) {
dstPtr = RL_ALLOC(accessor->count * numComp * sizeof(dstType);
}
This would reduce a lot of the 4-6 line if/else branches to 1 Line
LOAD_ATTRIBUTE(accessor, numpComp, srcType, dstPtr, dstType)
As this touches every if branch in the gltf load i didn't even want to start that before checking
There was a problem hiding this comment.
Personally, I don't like that macro at all, it could be confusing and it's difficult/impossible to debug.
Said that, proposed improvement sounds good to me. Feel free to send a PR with the required updates.
HarryDC
commented
Oct 8, 2024
| @@ -5697,23 +5699,25 @@ static Model LoadGLTF(const char *fileName) | |||
| // Load unsigned short data type into mesh.indices | |||
| LOAD_ATTRIBUTE(attribute, 1, unsigned short, model.meshes[meshIndex].indices) | |||
| } | |||
| else if (attribute->component_type == cgltf_component_type_r_8u) | |||
| { | |||
| // Init raylib mesh indices to copy glTF attribute data | |||
There was a problem hiding this comment.
With allocation inside the macro, this would be one line
|
@HarryDC Thanks for the improvement! Added a note on proposed macro change: looks fine to me. |
psxdev
pushed a commit
to raylib4Consoles/raylib
that referenced
this pull request
Nov 18, 2024
Only warns when there are more animations than currently implemented Allows mesh indices to be unsigned char
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.
Hit some small snags when importing from kenneys assets this is just a small update.
skinsthan expected, this allows users to decide if the degraded animations work for them or notunsigned charas an mesh index typeIt slightly changes the import macro to correctly cast to the expected type, the old macro is overloaded to maintain the old functionality