* view->filter->sky: Q3 shader based skies (skyParms keyword)
This commit is contained in:
parent
d3e48d8c31
commit
f61e0dcb67
|
|
@ -48,6 +48,7 @@ enum
|
||||||
EXCLUDE_DECALS = 0x00100000,
|
EXCLUDE_DECALS = 0x00100000,
|
||||||
EXCLUDE_FUNC_GROUPS = 0x00200000,
|
EXCLUDE_FUNC_GROUPS = 0x00200000,
|
||||||
EXCLUDE_POINT_ENT = 0x00400000,
|
EXCLUDE_POINT_ENT = 0x00400000,
|
||||||
|
EXCLUDE_SKY = 0x00800000,
|
||||||
};
|
};
|
||||||
|
|
||||||
class Filter
|
class Filter
|
||||||
|
|
|
||||||
|
|
@ -37,6 +37,7 @@ enum
|
||||||
QER_AREAPORTAL = 1 << 8,
|
QER_AREAPORTAL = 1 << 8,
|
||||||
QER_CLIP = 1 << 9,
|
QER_CLIP = 1 << 9,
|
||||||
QER_BOTCLIP = 1 << 10,
|
QER_BOTCLIP = 1 << 10,
|
||||||
|
QER_SKY = 1 << 11,
|
||||||
};
|
};
|
||||||
|
|
||||||
struct qtexture_t;
|
struct qtexture_t;
|
||||||
|
|
|
||||||
|
|
@ -1245,6 +1245,8 @@ bool ShaderTemplate::parseQuake3( Tokeniser& tokeniser ){
|
||||||
if( !string_equal( sky, "-" ) ){
|
if( !string_equal( sky, "-" ) ){
|
||||||
m_skyBox = sky;
|
m_skyBox = sky;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m_nFlags |= QER_SKY;
|
||||||
}
|
}
|
||||||
else if ( string_equal_nocase( token, "cull" ) ) {
|
else if ( string_equal_nocase( token, "cull" ) ) {
|
||||||
const char* cull = tokeniser.getToken();
|
const char* cull = tokeniser.getToken();
|
||||||
|
|
|
||||||
|
|
@ -1196,6 +1196,9 @@ filter_brush_all_faces g_filter_brush_detail( &g_filter_face_detail );
|
||||||
filter_face_shader_prefix g_filter_face_decals( "textures/decals/" );
|
filter_face_shader_prefix g_filter_face_decals( "textures/decals/" );
|
||||||
filter_brush_any_face g_filter_brush_decals( &g_filter_face_decals );
|
filter_brush_any_face g_filter_brush_decals( &g_filter_face_decals );
|
||||||
|
|
||||||
|
filter_face_flags g_filter_face_sky( QER_SKY );
|
||||||
|
filter_brush_any_face g_filter_brush_sky( &g_filter_face_sky );
|
||||||
|
|
||||||
|
|
||||||
void BrushFilters_construct(){
|
void BrushFilters_construct(){
|
||||||
add_brush_filter( g_filter_brush_clip, EXCLUDE_CLIP );
|
add_brush_filter( g_filter_brush_clip, EXCLUDE_CLIP );
|
||||||
|
|
@ -1227,6 +1230,7 @@ void BrushFilters_construct(){
|
||||||
add_brush_filter( g_filter_brush_liquids_q1, EXCLUDE_LIQUIDS );
|
add_brush_filter( g_filter_brush_liquids_q1, EXCLUDE_LIQUIDS );
|
||||||
add_brush_filter( g_filter_brush_lightgrid, EXCLUDE_LIGHTGRID );
|
add_brush_filter( g_filter_brush_lightgrid, EXCLUDE_LIGHTGRID );
|
||||||
add_brush_filter( g_filter_brush_decals, EXCLUDE_DECALS );
|
add_brush_filter( g_filter_brush_decals, EXCLUDE_DECALS );
|
||||||
|
add_brush_filter( g_filter_brush_sky, EXCLUDE_SKY );
|
||||||
}
|
}
|
||||||
|
|
||||||
#if 0
|
#if 0
|
||||||
|
|
|
||||||
|
|
@ -152,6 +152,8 @@ GtkToolbar* create_filter_toolbar(){
|
||||||
button = toolbar_append_toggle_button( toolbar, "HintsSkips (CTRL + H)\nRightClick: toggle tex\n\thint\n\thintLocal\n\thintSkip", "f-hint.png", "FilterHintsSkips" );
|
button = toolbar_append_toggle_button( toolbar, "HintsSkips (CTRL + H)\nRightClick: toggle tex\n\thint\n\thintLocal\n\thintSkip", "f-hint.png", "FilterHintsSkips" );
|
||||||
g_commonFuncs.emplace_back( button, std::vector<const char*>{ "hint", "hintlocal", "hintskip" } );
|
g_commonFuncs.emplace_back( button, std::vector<const char*>{ "hint", "hintlocal", "hintskip" } );
|
||||||
|
|
||||||
|
button = toolbar_append_toggle_button( toolbar, "Sky", "f-sky.png", "FilterSky" );
|
||||||
|
|
||||||
//toolbar_append_toggle_button( toolbar, "Paths (ALT + 8)", "texture_lock.png", "FilterPaths" );
|
//toolbar_append_toggle_button( toolbar, "Paths (ALT + 8)", "texture_lock.png", "FilterPaths" );
|
||||||
toolbar_append_space( toolbar );
|
toolbar_append_space( toolbar );
|
||||||
toolbar_append_toggle_button( toolbar, "Entities (ALT + 2)", "f-entities.png", "FilterEntities" );
|
toolbar_append_toggle_button( toolbar, "Entities (ALT + 2)", "f-entities.png", "FilterEntities" );
|
||||||
|
|
|
||||||
|
|
@ -207,6 +207,7 @@ void Filters_constructMenu( GtkMenu* menu_in_menu ){
|
||||||
}
|
}
|
||||||
create_check_menu_item_with_mnemonic( menu_in_menu, "FuncGroups", "FilterFuncGroups" );
|
create_check_menu_item_with_mnemonic( menu_in_menu, "FuncGroups", "FilterFuncGroups" );
|
||||||
create_check_menu_item_with_mnemonic( menu_in_menu, "Point Entities", "FilterPointEntities" );
|
create_check_menu_item_with_mnemonic( menu_in_menu, "Point Entities", "FilterPointEntities" );
|
||||||
|
create_check_menu_item_with_mnemonic( menu_in_menu, "Sky", "FilterSky" );
|
||||||
// filter manipulation
|
// filter manipulation
|
||||||
menu_separator( menu_in_menu );
|
menu_separator( menu_in_menu );
|
||||||
create_menu_item_with_mnemonic( menu_in_menu, "Invert filters", "InvertFilters" );
|
create_menu_item_with_mnemonic( menu_in_menu, "Invert filters", "InvertFilters" );
|
||||||
|
|
@ -256,6 +257,7 @@ void ConstructFilters(){
|
||||||
}
|
}
|
||||||
add_filter_command( EXCLUDE_FUNC_GROUPS, "FilterFuncGroups", accelerator_null() );
|
add_filter_command( EXCLUDE_FUNC_GROUPS, "FilterFuncGroups", accelerator_null() );
|
||||||
add_filter_command( EXCLUDE_POINT_ENT, "FilterPointEntities", accelerator_null() );
|
add_filter_command( EXCLUDE_POINT_ENT, "FilterPointEntities", accelerator_null() );
|
||||||
|
add_filter_command( EXCLUDE_SKY, "FilterSky", accelerator_null() );
|
||||||
|
|
||||||
PerformFiltering();
|
PerformFiltering();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
BIN
setup/data/tools/bitmaps/f-sky.png
Normal file
BIN
setup/data/tools/bitmaps/f-sky.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 586 B |
Loading…
Reference in New Issue
Block a user