idTech2 shaders fix and compiler warning fixes #660
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
This one was producing 11 or so warnings.
QER_ surface flags should not be set on idTech2 faces.
jdolan
commented
Nov 3, 2020
| @@ -210,7 +210,7 @@ static picoModel_t *_fm_load( PM_PARAMS_LOAD ){ | |||
| fm_xyz_st_t *triangle; | |||
| fm_frame_t *frame; | |||
|
|
|||
| picoByte_t *bb, bb0; | |||
| picoByte_t *bb, *bb0; | |||
| picoModel_t *picoModel; | |||
There was a problem hiding this comment.
This seems like an obvious error. The incorrect storage type of this variable was causing 11 or so warnings that went away when I converted it to a pointer. This variable is passed to the Pico free function, so I'm fairly sure that's correct.
| @@ -92,7 +92,7 @@ virtual void addType( const char* key, filetype_t type ){ | |||
| virtual void getTypeList( const char* key, IFileTypeList* typelist ){ | |||
| filetype_list_t& list_ref = m_typelists[key]; | |||
|
|
|||
| if (key == "model") { | |||
| if ( g_strcmp0( key, "model" ) == 0 ) { | |||
There was a problem hiding this comment.
Another fairly obvious error my compiler picked up.
| tex.flags = 0; | ||
| } else { | ||
| tex.flags = pCurrentShader->getFlags(); | ||
| } |
There was a problem hiding this comment.
And finally, here's the actual fix I set out to make.
|
I don't have a setup to test this atm, but this looks straightforward - thanks! Hope you're doing well. |
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.
This primarily addresses a bug where idTech2 games using the "shaders" API will receive Q3 / QER surface flags when a texture is applied to a face. Because these games are only using the "shaders" API for editor convenience (QER_TRANS is pretty nice), it's wrong to pass these flags down into the faces. QER_TRANS, for example, collides with SURF_LIGHT in Quake, Quake2, Quetoo, etc.