ioquake/gtkradiant
0
0
Fork 0
mirror of https://github.com/TTimo/GtkRadiant.git synced 2024-11-10 07:11:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #284 from jdolan/master

Browse source 
Skip Quake4 per-pixel lighting assets in texture window
This commit is contained in:
Timothee "TTimo" Besset 2015-03-08 10:19:31 -05:00
commit c285bb6119
8 changed files with 136 additions and 966 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

985
.cproject
View file

File diff suppressed because it is too large Load diff

67
.project
View file

@ -14,62 +14,6 @@
<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
<triggers>clean,full,incremental,</triggers>
<arguments>
<dictionary>
<key>?name?</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.append_environment</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.autoBuildTarget</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildArguments</key>
<value>-j3</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildCommand</key>
<value>/opt/local/bin/scons</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.buildLocation</key>
<value>${workspace_loc:/GtkRadiant}</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
<value> -c</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.contents</key>
<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
<value>false</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableFullBuild</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.fullBuildTarget</key>
<value></value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.stopOnError</key>
<value>true</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
<value>false</value>
</dictionary>
</arguments>
</buildCommand>
<buildCommand>
@ -86,4 +30,15 @@
<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
<nature>org.python.pydev.pythonNature</nature>
</natures>
<filteredResources>
<filter>
<id>1404663489032</id>
<name></name>
<type>10</type>
<matcher>
<id>org.eclipse.ui.ide.multiFilter</id>
<arguments>1.0-name-matches-false-false-apple/target</arguments>
</matcher>
</filter>
</filteredResources>
</projectDescription>

4
.pydevproject
View file

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<?eclipse-pydev version="1.0"?>
<pydev_project>
<?eclipse-pydev version="1.0"?><pydev_project>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
<pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
</pydev_project>

2
config.py
View file

@ -27,7 +27,7 @@ class Config:
# platforms for which to assemble a setup
self.setup_platforms = [ 'local', 'x86', 'x64', 'win32' ]
# paks to assemble in the setup
self.setup_packs = [ 'Q3Pack', 'UrTPack', 'ETPack', 'QLPack', 'Q2Pack', 'Q2WPack', 'JAPack', 'STVEFPack', 'WolfPack' ]
self.setup_packs = [ 'Q3Pack', 'UrTPack', 'ETPack', 'QLPack', 'Q2Pack', 'QuetooPack', 'JAPack', 'STVEFPack', 'WolfPack' ]
def __repr__( self ):
return 'config: target=%s config=%s' % ( self.target_selected, self.config_selected )

2
radiant/gtkmisc.cpp
View file

@ -732,7 +732,7 @@ GtkWidget* new_pixmap( GtkWidget* widget, const char* filename ){
GtkWidget* new_image_icon(const char* filename) {
CString str = g_strBitmapsPath;
str += filename;
return gtk_image_new_from_file(str);
return gtk_image_new_from_file( (const char *) str );
}
// =============================================================================

26
radiant/preferences.cpp
View file

@ -3341,7 +3341,7 @@ void CGameInstall::OnGameSelectChanged( GtkWidget *widget, gpointer data ) {
i->UpdateData( FALSE );
int game_id = i->m_availGames[ i->m_nComboSelect ];
if ( game_id == GAME_Q2 || game_id == GAME_Q2W ) {
if ( game_id == GAME_Q2 || game_id == GAME_QUETOO ) {
gtk_widget_show( i->m_executablesVBox );
} else {
gtk_widget_hide( i->m_executablesVBox );
@ -3387,8 +3387,8 @@ void CGameInstall::BuildDialog() {
case GAME_UFOAI:
gtk_combo_box_append_text( GTK_COMBO_BOX( game_select_combo ), _( "UFO: Alien Invasion" ) );
break;
case GAME_Q2W:
gtk_combo_box_append_text( GTK_COMBO_BOX( game_select_combo ), _( "Quake2World" ) );
case GAME_QUETOO:
gtk_combo_box_append_text( GTK_COMBO_BOX( game_select_combo ), _( "Quetoo" ) );
break;
case GAME_WARSOW:
gtk_combo_box_append_text( GTK_COMBO_BOX( game_select_combo ), _( "Warsow" ) );
@ -3523,9 +3523,9 @@ void CGameInstall::Run() {
gamePack = UFOAI_PACK;
gameFilePath += UFOAI_GAME;
break;
case GAME_Q2W:
gamePack = Q2W_PACK;
gameFilePath += Q2W_GAME;
case GAME_QUETOO:
gamePack = QUETOO_PACK;
gameFilePath += QUETOO_GAME;
break;
case GAME_WARSOW:
gameFilePath += WARSOW_GAME;
@ -3630,13 +3630,13 @@ void CGameInstall::Run() {
fprintf( fg, " no_patch=\"true\"\n" );
break;
}
case GAME_Q2W: {
case GAME_QUETOO: {
#if defined( __APPLE__ ) || defined( __linux__ )
fprintf( fg, " " ENGINE_ATTRIBUTE "=\"quake2world\"\n" );
fprintf( fg, " " PREFIX_ATTRIBUTE "=\".quake2world\"\n" );
fprintf( fg, " " ENGINE_ATTRIBUTE "=\"quetoo\"\n" );
fprintf( fg, " " PREFIX_ATTRIBUTE "=\".quetoo\"\n" );
#elif _WIN32
fprintf( fg, " " ENGINE_ATTRIBUTE "=\"quake2world.exe\"\n" );
fprintf( fg, " " PREFIX_ATTRIBUTE "=\"Quake2World\"\n" );
fprintf( fg, " " ENGINE_ATTRIBUTE "=\"quetoo.exe\"\n" );
fprintf( fg, " " PREFIX_ATTRIBUTE "=\"Quetoo\"\n" );
#endif
fprintf( fg, " idtech2=\"true\"\n" );
fprintf( fg, " basegame=\"default\"\n" );
@ -3769,8 +3769,8 @@ void CGameInstall::ScanGames() {
if ( stricmp( dirname, UFOAI_PACK ) == 0 ) {
m_availGames[ iGame++ ] = GAME_UFOAI;
}
if ( stricmp( dirname, Q2W_PACK ) == 0 ) {
m_availGames[ iGame++ ] = GAME_Q2W;
if ( stricmp( dirname, QUETOO_PACK ) == 0 ) {
m_availGames[ iGame++ ] = GAME_QUETOO;
}
if ( stricmp( dirname, WARSOW_PACK ) == 0 ) {
m_availGames[ iGame++ ] = GAME_WARSOW;

6
radiant/preferences.h
View file

@ -205,7 +205,7 @@ void Dump();
#define Q3_GAME "q3.game"
#define URT_GAME "urt.game"
#define UFOAI_GAME "ufoai.game"
#define Q2W_GAME "q2w.game"
#define QUETOO_GAME "quetoo.game"
#define WARSOW_GAME "warsow.game"
#define NEXUIZ_GAME "nexuiz.game"
#define Q2_GAME "q2.game"
@ -220,7 +220,7 @@ void Dump();
#define Q3_PACK "Q3Pack"
#define URT_PACK "UrTPack"
#define UFOAI_PACK "UFOAIPack"
#define Q2W_PACK "Q2WPack"
#define QUETOO_PACK "QuetooPack"
#define WARSOW_PACK "WarsowPack"
#define NEXUIZ_PACK "NexuizPack"
#define Q2_PACK "Q2Pack"
@ -248,7 +248,7 @@ public:
GAME_Q3 = 1,
GAME_URT,
GAME_UFOAI,
GAME_Q2W,
GAME_QUETOO,
GAME_WARSOW,
GAME_NEXUIZ,
GAME_Q2,

10
radiant/texwindow.cpp
View file

@ -765,6 +765,7 @@ void Texture_ShowDirectory(){
strTemp = name;
strTemp.MakeLower();
// avoid effect textures for Q3 texture sets
if ( strTemp.Find( ".specular" ) >= 0 ||
strTemp.Find( ".glow" ) >= 0 ||
strTemp.Find( ".bump" ) >= 0 ||
@ -774,6 +775,15 @@ void Texture_ShowDirectory(){
continue;
}
// avoid glow, heightmap, normalmap and specular maps for Q4 texture sets
if ( g_str_has_suffix( name, "_g" ) ||
g_str_has_suffix( name, "_h" ) ||
g_str_has_suffix( name, "_local" ) ||
g_str_has_suffix( name, "_nm" ) ||
g_str_has_suffix( name, "_s" )) {
continue;
}
// avoid ever loading a texture name with spaces
if ( strTemp.Find( " " ) >= 0 ) {
Sys_FPrintf( SYS_WRN, "WARNING: Skipping texture name with spaces [%s]\n", strTemp.GetBuffer() );