From 66b967bd09eb5e7009ec37c9c6812fcbde5b5f7e Mon Sep 17 00:00:00 2001 From: Jay Dolan Date: Mon, 2 Nov 2020 17:42:18 -0500 Subject: [PATCH 1/5] Eclipse project files. --- .cproject | 141 ++++++++++++++++-------------------------------------- .project | 8 +--- 2 files changed, 42 insertions(+), 107 deletions(-) diff --git a/.cproject b/.cproject index 3c25bc0b..74c750a1 100644 --- a/.cproject +++ b/.cproject @@ -1,117 +1,55 @@ - - + + + + + - - - - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -121,31 +59,34 @@ - + + + + + + + + + - + - + - - - - - + - - + \ No newline at end of file diff --git a/.project b/.project index 3c177e26..8b83afc0 100644 --- a/.project +++ b/.project @@ -5,14 +5,9 @@ - - org.python.pydev.PyDevBuilder - - - org.eclipse.cdt.managedbuilder.core.genmakebuilder - clean,full,incremental, + full,incremental, @@ -28,7 +23,6 @@ org.eclipse.cdt.core.ccnature org.eclipse.cdt.managedbuilder.core.managedBuildNature org.eclipse.cdt.managedbuilder.core.ScannerConfigNature - org.python.pydev.pythonNature From 23010c89bcaf7235de94dc7ed4df6e062bbc8c77 Mon Sep 17 00:00:00 2001 From: Jay Dolan Date: Mon, 2 Nov 2020 17:42:50 -0500 Subject: [PATCH 2/5] Fix glaring pointer issue in Picomodel load / free. This one was producing 11 or so warnings. --- libs/picomodel/pm_fm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/picomodel/pm_fm.c b/libs/picomodel/pm_fm.c index 716a89d0..e0e01ca9 100644 --- a/libs/picomodel/pm_fm.c +++ b/libs/picomodel/pm_fm.c @@ -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; picoSurface_t *picoSurface; picoShader_t *picoShader; From c064a1c0a44b18defd2a4c58382a6617896a4c91 Mon Sep 17 00:00:00 2001 From: Jay Dolan Date: Mon, 2 Nov 2020 17:43:23 -0500 Subject: [PATCH 3/5] Fix string comparison fail for key "model" --- radiant/pluginmanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radiant/pluginmanager.cpp b/radiant/pluginmanager.cpp index 3fc2746f..fc2ed18f 100644 --- a/radiant/pluginmanager.cpp +++ b/radiant/pluginmanager.cpp @@ -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 ) { // Get the list of all supported types (adapted from kaz) CString allTypesFilter; for (unsigned int i = 0; i < list_ref.size(); ++i) { From 91365cefe69bd54c701f10ff3c17e9f12172e393 Mon Sep 17 00:00:00 2001 From: Jay Dolan Date: Mon, 2 Nov 2020 22:55:22 -0500 Subject: [PATCH 4/5] Don't set shader flags on idTech2 faces. QER_ surface flags should not be set on idTech2 faces. --- radiant/texwindow.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/radiant/texwindow.cpp b/radiant/texwindow.cpp index b686f6f3..04cddcb4 100644 --- a/radiant/texwindow.cpp +++ b/radiant/texwindow.cpp @@ -1488,7 +1488,13 @@ void SelectTexture( int mx, int my, bool bShift, bool bFitScale ){ tex.scale[0] = g_PrefsDlg.m_fDefTextureScale; tex.scale[1] = g_PrefsDlg.m_fDefTextureScale; } - tex.flags = pCurrentShader->getFlags(); + // jdolan - idTech2 games use shaders purely for editing convenience (e.g. QER_TRANS) + // these flags should not be set on idTech2 faces, as they collide with e.g. SURF_LIGHT + if ( g_pGameDescription->idTech2 ) { + tex.flags = 0; + } else { + tex.flags = pCurrentShader->getFlags(); + } // TTimo - shader code cleanup // texdef.name is the name of the shader, not the name of the actual texture file tex.SetName( pCurrentShader->getName() ); From f3db4e4523e06a54576a8437ec127ae7d337fd21 Mon Sep 17 00:00:00 2001 From: Jay Dolan Date: Mon, 2 Nov 2020 22:55:33 -0500 Subject: [PATCH 5/5] Eclipse project files. --- .project | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.project b/.project index 8b83afc0..55f0499c 100644 --- a/.project +++ b/.project @@ -26,9 +26,9 @@ - 1404663489032 + 1604374596782 - 10 + 30 org.eclipse.ui.ide.multiFilter 1.0-name-matches-false-false-apple/target