From c1ccdb5e61320d1b41f740213acfefcdb427be7c Mon Sep 17 00:00:00 2001 From: namespace Date: Sat, 16 Dec 2006 18:38:08 +0000 Subject: [PATCH] 15/12/2006 namespace - Inverted bevel can be used with end caps (Topsun) - Removed needless .pdb files from win32 installer (Topsun) - Fixed .ase picomodel loader to load shaders again (Shaderman) - Removed translucent brushes fix because of wrong rendering behaviour on Linux - New cool(!) radiant icon by eb git-svn-id: https://zerowing.idsoftware.com/svn/radiant/GtkRadiant/trunk@125 8a3a26a2-13c4-0310-b231-cf6edde360e5 --- CHANGES | 9 +++++++++ libs/picomodel/pm_ase.c | 26 ++----------------------- radiant/patchmanip.cpp | 2 +- radiant/radiant.ico | Bin 1078 -> 2238 bytes radiant/radiant_old.ico | Bin 0 -> 1078 bytes radiant/renderstate.cpp | 6 +----- setup/win32/components/archivepak.xml | 1 - setup/win32/components/archivewad.xml | 1 - setup/win32/components/archivezip.xml | 1 - setup/win32/components/bobtoolz.xml | 1 - setup/win32/components/brushexport.xml | 1 - setup/win32/components/entityq3.xml | 1 - setup/win32/components/gtkradiant.xml | 1 - setup/win32/components/imagehl.xml | 1 - setup/win32/components/imagem8.xml | 1 - setup/win32/components/imagepng.xml | 1 - setup/win32/components/imageq2.xml | 1 - setup/win32/components/imageq3.xml | 1 - setup/win32/components/mapq3.xml | 1 - setup/win32/components/mapxml.xml | 1 - setup/win32/components/modelmd3.xml | 1 - setup/win32/components/modelpico.xml | 1 - setup/win32/components/prtview.xml | 1 - setup/win32/components/shaderplug.xml | 1 - setup/win32/components/shadersq3.xml | 1 - setup/win32/components/sunplug.xml | 1 - setup/win32/components/vfsq3.xml | 1 - setup/win32/gtkradiant-1.5.0.xml | 2 +- 28 files changed, 14 insertions(+), 52 deletions(-) create mode 100644 radiant/radiant_old.ico diff --git a/CHANGES b/CHANGES index a20938a1..ac91a100 100644 --- a/CHANGES +++ b/CHANGES @@ -1,7 +1,16 @@ This is the changelog for developers, != changelog for the end user that we distribute with the binaries. (see changelog) +15/12/2006 +namespace + - Inverted bevel can be used with end caps (Topsun) + - Removed needless .pdb files from win32 installer (Topsun) + - Fixed .ase picomodel loader to load shaders again (Shaderman) + - Removed translucent brushes fix because of wrong rendering behaviour on Linux + - New cool(!) radiant icon by eb + 13/12/2006 +namespace - Added tremoulus-support to q3map2 08/12/2006 diff --git a/libs/picomodel/pm_ase.c b/libs/picomodel/pm_ase.c index 264bd2b9..985ea8a0 100644 --- a/libs/picomodel/pm_ase.c +++ b/libs/picomodel/pm_ase.c @@ -1125,33 +1125,11 @@ static picoModel_t *_ase_load( PM_PARAMS_LOAD ) } } - /* find game root */ + /* find shader path */ for(; *p != '\0'; ++p) { - if(_pico_strnicmp(p, "quake", 5) == 0 || _pico_strnicmp(p, "doom", 4) == 0) + if(_pico_strnicmp(p, "models/", 7) == 0 || _pico_strnicmp(p, "textures/", 9) == 0) { - /* root-relative */ - for(; *p != '\0'; ++p) - { - if(*p == '/') - { - ++p; - /* game-relative */ - for(; *p != '\0'; ++p) - { - if(*p == '/') - { - ++p; - break; - } - } - } - } - } - /* DoomEdit's ASE loader searches for /base/ */ - else if(_pico_strnicmp(p, "/base/", 6) == 0) - { - p += 6; break; } } diff --git a/radiant/patchmanip.cpp b/radiant/patchmanip.cpp index d30cb568..80292238 100644 --- a/radiant/patchmanip.cpp +++ b/radiant/patchmanip.cpp @@ -77,7 +77,7 @@ void Patch_makeCaps(Patch& patch, scene::Instance& instance, EPatchCap type, con return; } if((type == eCapBevel || type == eCapIBevel) - && patch.getWidth() != 3) + && patch.getWidth() != 3 && patch.getWidth() != 5) { globalErrorStream() << "cannot create bevel-cap - patch width != 3\n"; return; diff --git a/radiant/radiant.ico b/radiant/radiant.ico index b45ef36ace4af290cc1bf043fb406fee57614ee1..45e8258ee5d5404cd07ffafbb32e08e36b765e3b 100644 GIT binary patch literal 2238 zcmb_eX;4#F6#gj8SQr@`$aI(qkZ29y0%8P36eDUyQJw;gTImoiDlSEm)`gBJDBuF( zhDE4~tr%29b}=Hm$SS*RE{F)CV@0CX;EZE>UP7f%9sl%Z&b{y5bIy0a^WF1i0_f0> z&xdAQ_!9Vvo~+6EWV6Y1K%4B)(=M7>hi2Aj@GUGb%E$Hd~;|A;u+>RaFw&GRq zb9gfDNWXX9}+{+WKwbg{3gZ%6)toq&?67QApS@|8h?zW+=t_DrjRk(et5)GB* zs4Fi;O=$_LZWN)ixDXXZ1t>4fM_EB0Hm+NXwX0WQ%_<3eB|c~&+~%5F@ZYc=wN;h) ztM3Jr&;LaC!w#G~eG+NJA?3UrmlMxH9)Ai2ifrT&hukZfxSo}PoXm76(o=CYEd|-B zmvJQ}8CjPvAu~A%^~9x?xD@3m(A(3E=a0MatgDlBoeq~-&bU)wgO-{q;+IeS^045W zd6++U4xV=0M^F1*bhb6)VQUi}G&iEXseyR1HC9lKWvH)UYrKK#o5fUP0qJ=RanVO{ z;^<+xyDh}xg$vNZ=C<5MJLTWIU5~qsb-2?|i#9s_S-ZPK53XLi8c(fv89vj@XZb`@#{qHw+Qsp@<{SN%90VlKy>! z_o)3I>2?trmo6YZ={%CR)15DLosT7?t@|Q3>a||HQudKXI}jfi zgJoVGShHG!?#>Q`1pR`!E+UK>&Btgy4}6{lz8*6gR+a+FUxe}FtYK|s30s?qu%Wsp zQhjz*kBNyfjOqI|G&F>c&cFw*`N}^&ss7&~`V5@B`BMSVIG9euPX@3NGGVb&8_+%& zXJF2cwAKPkWdr*$YXB2~1ZZyTr7n>9XsGVZaf@ zvOA0ho-0#uhx%1~j)DM;<`z9sskU^xRWuLK{D9yi^)E8z2wh_73-FJOT}U_BY7YYa>NWrDpa^e@Li>Ag^e1PgKZ;Gq%ks~ zL?Miztg)sQLyLf_PLRe>wx3Mvc*BAZ4yd>ZVlhW5t!o`STpKpZ!dxio;)>mhLsdsA z^#}8`PqF58rtFQ0E7|F2R(g`d8-AM=sMdbYu8i ztmW{XVeg;w4-5b7tNNWT)E9;H4@dU(|1A$Ln{rGwKg?9MRu5YsA}r M_6)N3WNNMb4eby8hX4Qo literal 1078 zcmbtTy>8nu5dNsJgO=0;grb`2EJcLW1dZ0->)7@RI9f;_;~hj*oy-+NNYn zR?w6r`bH9OA0d`%cu`fNk@-;Rx{j+@-0;FV(a3znB;qisG56rGhm{KDhUoucqb6qi zpnaV0?dPg)w*B+;F<6;4ty>c+FfECgB$m8w8)MSi7}1b6!_CuLj#qh|`Z7EQ>hK}d zun!_{2y%1D;O2uRQ~aJ9S{GIq8Ku?Q3I?@okVNdb>|}!^E-Z&Yut?b-;|t47w2-vV zAN+Y9{dXvyzhfle3^>=9o`1e~F7o$x&i#wet^1bPr(I%?mVJ49)t7%R`|`(qU*5%h ztLG;lR_j-bPtRU2mh0Jq*nIBGU(0^(oGZ!B$(&1VQ*xa1ih3m38*8t?(I!`Zp`?oL zfpZ@6#hz>iBMwMh8y*FdH%((;j8U8s@s&6ZaA>|Q-eznV3T?B3%_;!tm4uFU1APhn eo*&>Bte^k9(3>;h;v;bL1h}T{%go2gZ~7OnpTqS4 diff --git a/radiant/radiant_old.ico b/radiant/radiant_old.ico new file mode 100644 index 0000000000000000000000000000000000000000..b45ef36ace4af290cc1bf043fb406fee57614ee1 GIT binary patch literal 1078 zcmbtTy>8nu5dNsJgO=0;grb`2EJcLW1dZ0->)7@RI9f;_;~hj*oy-+NNYn zR?w6r`bH9OA0d`%cu`fNk@-;Rx{j+@-0;FV(a3znB;qisG56rGhm{KDhUoucqb6qi zpnaV0?dPg)w*B+;F<6;4ty>c+FfECgB$m8w8)MSi7}1b6!_CuLj#qh|`Z7EQ>hK}d zun!_{2y%1D;O2uRQ~aJ9S{GIq8Ku?Q3I?@okVNdb>|}!^E-Z&Yut?b-;|t47w2-vV zAN+Y9{dXvyzhfle3^>=9o`1e~F7o$x&i#wet^1bPr(I%?mVJ49)t7%R`|`(qU*5%h ztLG;lR_j-bPtRU2mh0Jq*nIBGU(0^(oGZ!B$(&1VQ*xa1ih3m38*8t?(I!`Zp`?oL zfpZ@6#hz>iBMwMh8y*FdH%((;j8U8s@s&6ZaA>|Q-eznV3T?B3%_;!tm4uFU1APhn eo*&>Bte^k9(3>;h;v;bL1h}T{%go2gZ~7OnpTqS4 literal 0 HcmV?d00001 diff --git a/radiant/renderstate.cpp b/radiant/renderstate.cpp index db71b226..2f5596d1 100644 --- a/radiant/renderstate.cpp +++ b/radiant/renderstate.cpp @@ -2387,11 +2387,7 @@ void OpenGLShader::construct(const char* name) state.m_colour[2] = 0; state.m_colour[3] = 0.3f; state.m_state = RENDER_FILL|RENDER_DEPTHTEST|RENDER_CULLFACE|RENDER_BLEND|RENDER_COLOURWRITE|RENDER_DEPTHWRITE; - - // The bug "Selecting translucent brushes, such as clip, cause them to disappear leaving - // only the red selection box." seems to be fixed by removing the next line. - - // state.m_sort = OpenGLState::eSortHighlight; + state.m_sort = OpenGLState::eSortHighlight; state.m_depthfunc = GL_LEQUAL; } else if(string_equal(name+1, "CAM_OVERLAY")) diff --git a/setup/win32/components/archivepak.xml b/setup/win32/components/archivepak.xml index 7dd920e1..edaa0399 100644 --- a/setup/win32/components/archivepak.xml +++ b/setup/win32/components/archivepak.xml @@ -2,6 +2,5 @@ - diff --git a/setup/win32/components/archivewad.xml b/setup/win32/components/archivewad.xml index 349c31e3..b9bef749 100644 --- a/setup/win32/components/archivewad.xml +++ b/setup/win32/components/archivewad.xml @@ -2,6 +2,5 @@ - diff --git a/setup/win32/components/archivezip.xml b/setup/win32/components/archivezip.xml index 97f5af33..40eb6ee7 100644 --- a/setup/win32/components/archivezip.xml +++ b/setup/win32/components/archivezip.xml @@ -2,6 +2,5 @@ - diff --git a/setup/win32/components/bobtoolz.xml b/setup/win32/components/bobtoolz.xml index 14889bf2..f48ba12b 100644 --- a/setup/win32/components/bobtoolz.xml +++ b/setup/win32/components/bobtoolz.xml @@ -1,7 +1,6 @@ - diff --git a/setup/win32/components/brushexport.xml b/setup/win32/components/brushexport.xml index 1e4b48f1..5c44e8c2 100644 --- a/setup/win32/components/brushexport.xml +++ b/setup/win32/components/brushexport.xml @@ -1,6 +1,5 @@ - diff --git a/setup/win32/components/entityq3.xml b/setup/win32/components/entityq3.xml index 7a07d774..903aaca4 100644 --- a/setup/win32/components/entityq3.xml +++ b/setup/win32/components/entityq3.xml @@ -2,6 +2,5 @@ - diff --git a/setup/win32/components/gtkradiant.xml b/setup/win32/components/gtkradiant.xml index 62111604..60d815ec 100644 --- a/setup/win32/components/gtkradiant.xml +++ b/setup/win32/components/gtkradiant.xml @@ -1,7 +1,6 @@ - diff --git a/setup/win32/components/imagehl.xml b/setup/win32/components/imagehl.xml index a7d0428c..1f8a0ee0 100644 --- a/setup/win32/components/imagehl.xml +++ b/setup/win32/components/imagehl.xml @@ -2,6 +2,5 @@ - diff --git a/setup/win32/components/imagem8.xml b/setup/win32/components/imagem8.xml index bfebe1e8..8c55315e 100644 --- a/setup/win32/components/imagem8.xml +++ b/setup/win32/components/imagem8.xml @@ -2,6 +2,5 @@ - diff --git a/setup/win32/components/imagepng.xml b/setup/win32/components/imagepng.xml index 35209b68..b2d318f3 100644 --- a/setup/win32/components/imagepng.xml +++ b/setup/win32/components/imagepng.xml @@ -2,6 +2,5 @@ - diff --git a/setup/win32/components/imageq2.xml b/setup/win32/components/imageq2.xml index 68f25217..f2353b2f 100644 --- a/setup/win32/components/imageq2.xml +++ b/setup/win32/components/imageq2.xml @@ -2,6 +2,5 @@ - diff --git a/setup/win32/components/imageq3.xml b/setup/win32/components/imageq3.xml index 6bf4f6ed..9bc54cb8 100644 --- a/setup/win32/components/imageq3.xml +++ b/setup/win32/components/imageq3.xml @@ -2,6 +2,5 @@ - diff --git a/setup/win32/components/mapq3.xml b/setup/win32/components/mapq3.xml index 8f851ad4..7a2b4214 100644 --- a/setup/win32/components/mapq3.xml +++ b/setup/win32/components/mapq3.xml @@ -2,7 +2,6 @@ - diff --git a/setup/win32/components/mapxml.xml b/setup/win32/components/mapxml.xml index bc98f0d0..5f01e251 100644 --- a/setup/win32/components/mapxml.xml +++ b/setup/win32/components/mapxml.xml @@ -2,6 +2,5 @@ - diff --git a/setup/win32/components/modelmd3.xml b/setup/win32/components/modelmd3.xml index eaa340eb..dad1e37e 100644 --- a/setup/win32/components/modelmd3.xml +++ b/setup/win32/components/modelmd3.xml @@ -2,6 +2,5 @@ - diff --git a/setup/win32/components/modelpico.xml b/setup/win32/components/modelpico.xml index 31ba1d9c..67e62c32 100644 --- a/setup/win32/components/modelpico.xml +++ b/setup/win32/components/modelpico.xml @@ -2,6 +2,5 @@ - diff --git a/setup/win32/components/prtview.xml b/setup/win32/components/prtview.xml index 47f2c318..40fd2c93 100644 --- a/setup/win32/components/prtview.xml +++ b/setup/win32/components/prtview.xml @@ -1,6 +1,5 @@ - diff --git a/setup/win32/components/shaderplug.xml b/setup/win32/components/shaderplug.xml index 152a188e..a32d816c 100644 --- a/setup/win32/components/shaderplug.xml +++ b/setup/win32/components/shaderplug.xml @@ -1,6 +1,5 @@ - diff --git a/setup/win32/components/shadersq3.xml b/setup/win32/components/shadersq3.xml index ddf6da8e..114b21bb 100644 --- a/setup/win32/components/shadersq3.xml +++ b/setup/win32/components/shadersq3.xml @@ -2,7 +2,6 @@ - diff --git a/setup/win32/components/sunplug.xml b/setup/win32/components/sunplug.xml index 22d76ac3..9fd915b6 100644 --- a/setup/win32/components/sunplug.xml +++ b/setup/win32/components/sunplug.xml @@ -1,6 +1,5 @@ - diff --git a/setup/win32/components/vfsq3.xml b/setup/win32/components/vfsq3.xml index 9310db34..aff6d851 100644 --- a/setup/win32/components/vfsq3.xml +++ b/setup/win32/components/vfsq3.xml @@ -2,6 +2,5 @@ - diff --git a/setup/win32/gtkradiant-1.5.0.xml b/setup/win32/gtkradiant-1.5.0.xml index e13bdfcc..a480e802 100644 --- a/setup/win32/gtkradiant-1.5.0.xml +++ b/setup/win32/gtkradiant-1.5.0.xml @@ -45,7 +45,7 @@ - + -- 2.39.2