Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

renderer: make dpMaterials collapsed shader from the start, including non-shader images #266

Merged
merged 7 commits into from Jan 21, 2020
Merged

renderer: make dpMaterials collapsed shader from the start, including non-shader images #266

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
887b8ce
bikesheding: rename variable in comment as in code
illwieckz Jan 8, 2020
8e603b1
tr_shader: load dpMaterial extra maps in collapsed shader
illwieckz Jan 8, 2020
e18713e
tr_shader: rename extraMapParsers as dpExtraMapParsers
illwieckz Jan 8, 2020
ef5f2fa
tr_shader: delete heightmap collapse code, there is no usage anymore
illwieckz Jan 8, 2020
9fe4233
tr_shader: also load dpMaterial extra maps of non-shader image
illwieckz Jan 8, 2020
a35474f
tr_shader: better way to test for normalmap in LoadExtraMaps
illwieckz Jan 8, 2020
84a6917
renderer: better comments and debug messages
illwieckz Jan 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/engine/renderer/tr_bsp.cpp
View file
Open in desktop
Expand Up @@ -3628,7 +3628,7 @@ static void R_LoadShaders( lump_t *l )

for ( i = 0; i < count; i++ )
{
Log::Debug("shader: '%s'", out[ i ].shader );
Log::Debug("loading shader: '%s'", out[ i ].shader );

out[ i ].surfaceFlags = LittleLong( out[ i ].surfaceFlags );
out[ i ].contentFlags = LittleLong( out[ i ].contentFlags );
Expand Down
2 changes: 2 additions & 0 deletions src/engine/renderer/tr_local.h
View file
Open in desktop
Expand Up @@ -1072,6 +1072,8 @@ static inline void halfToFloat( const f16vec4_t in, vec4_t out )

bool active;

bool dpMaterial;

textureBundle_t bundle[ MAX_TEXTURE_BUNDLES ];

expression_t ifExp;
Expand Down