From ee5011546b10142fee0793077c7b52cbb0450442 Mon Sep 17 00:00:00 2001 From: psperl Date: Wed, 3 Oct 2007 16:27:57 +0000 Subject: [PATCH] renamed PBuffer to FBO git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@502 6778bc44-b910-0410-a7a0-be141de4315d --- .../ftgl_static_lib/Release_ST/BuildLog.htm | Bin 62786 -> 62790 bytes .../freetype-2.3.5/objs/release/BuildLog.htm | Bin 17924 -> 18288 bytes src/projectM-engine/{PBuffer.cpp => FBO.cpp} | 4 ++-- src/projectM-engine/{PBuffer.hpp => FBO.hpp} | 10 +++++----- src/projectM-engine/Renderer.hpp | 2 +- src/projectM-engine/libprojectM.vcproj | 16 ++++++++-------- src/projectM-engine/projectM.hpp | 2 +- src/projectM-wmp/projectM-wmp.suo | Bin 56320 -> 56320 bytes .../projectM-wmp/Release/BuildLog.htm | Bin 14032 -> 12418 bytes .../projectM-wmp/projectM-wmp_i.c | 2 +- 10 files changed, 18 insertions(+), 18 deletions(-) rename src/projectM-engine/{PBuffer.cpp => FBO.cpp} (99%) rename src/projectM-engine/{PBuffer.hpp => FBO.hpp} (93%) diff --git a/src/WinLibs/FTGL/win32_vcpp/ftgl_static_lib/Release_ST/BuildLog.htm b/src/WinLibs/FTGL/win32_vcpp/ftgl_static_lib/Release_ST/BuildLog.htm index 96c269b3dee1033cf0c116d974bb7879b213fa94..eef55e376f475d67fc7794fa0c851a7382976078 100644 GIT binary patch delta 116 zcmX@~iuu?p<_#y9Sc4c+8Im@iWLnHDXvkp7V9a2_V9sC$ri~{X3Y%}KGA9<{RGGUs05B04P5=M^ delta 112 zcmX^1iuuqh<_#y97@ansWm?QE=*D2iV9a37V8CDjq|F!%H#f3ba$^xbEf~oN6gEdy WJ-Lz1d~=TQ8xBmV&6zTHZvX({bQt*n diff --git a/src/WinLibs/freetype-2.3.5/objs/release/BuildLog.htm b/src/WinLibs/freetype-2.3.5/objs/release/BuildLog.htm index f0e008849c4cc9b469523da278c50af4415e0469..60933eb38c6f7245d3a811897be7d09f4ec586ef 100644 GIT binary patch delta 633 zcmZqaVf@g?xZwm7YY;;!L(=AxOp?r^#SBFZ$qX?J;S8A!c?>>4GKryha-p8$BsL9U zLk2?zV+IQba|Sa8BOu#|!DO>F8$Tb(x+XJ9-6o{T2#ZyZ88`0|f5%9&R$}ZkLAP(R zHJjKl*hn zxC}S<+&&SE;RSve9Q6^PP@&uC%>|j*(_kQ3AYK_n_t;AvBI5(B?(Dw JUgDC#2mp1>lB56t delta 350 zcmey+$Jo-txZwm7qtoWIOp?r#MPvjf8)%vdn=!aD7&DkN7%*4>X(I*`28+oXrA;^Y zu-)RttLVDOZ6tX&9EPl8+{`BNjuEd)WRpM+L37ULjnd%=r(jc1skxB}Y{LW#vB@=@ zLYu2}mca!!$LVW8?1#x-GiYFeDmUA_#dHf;>E;O*d@wy0oBvsTg6WaiY+!p1CL=M~ Uz*c5+ltUUT)JGbd1>6!C0WBa{4*&oF diff --git a/src/projectM-engine/PBuffer.cpp b/src/projectM-engine/FBO.cpp similarity index 99% rename from src/projectM-engine/PBuffer.cpp rename to src/projectM-engine/FBO.cpp index 316facd93..278bf47c7 100755 --- a/src/projectM-engine/PBuffer.cpp +++ b/src/projectM-engine/FBO.cpp @@ -19,7 +19,7 @@ * */ /** - * $Id: pbuffer.c,v 1.1.1.1 2005/12/23 18:05:00 psperl Exp $ + * $Id: FBO.c,v 1.1.1.1 2005/12/23 18:05:00 psperl Exp $ * * Render this methods */ @@ -28,7 +28,7 @@ //#include #include "Common.hpp" -#include "PBuffer.hpp" +#include "FBO.hpp" #ifdef MACOS #include diff --git a/src/projectM-engine/PBuffer.hpp b/src/projectM-engine/FBO.hpp similarity index 93% rename from src/projectM-engine/PBuffer.hpp rename to src/projectM-engine/FBO.hpp index 9ee9fed5a..3ee2e2354 100755 --- a/src/projectM-engine/PBuffer.hpp +++ b/src/projectM-engine/FBO.hpp @@ -19,7 +19,7 @@ * */ /** - * $Id: PBuffer.hpp,v 1.1.1.1 2005/12/23 18:05:00 psperl Exp $ + * $Id: FBO.hpp,v 1.1.1.1 2005/12/23 18:05:00 psperl Exp $ * * Opaque render target * @@ -28,11 +28,11 @@ #ifndef _RENDERTARGET_H #define _RENDERTARGET_H -#ifdef USE_FBO -#include -#endif -#if defined(MACOS) && !defined(USE_FBO) +#include + + +#if defined(MACOS) #include #endif /** MACOS */ diff --git a/src/projectM-engine/Renderer.hpp b/src/projectM-engine/Renderer.hpp index 13f7451da..fb9d550ca 100644 --- a/src/projectM-engine/Renderer.hpp +++ b/src/projectM-engine/Renderer.hpp @@ -1,7 +1,7 @@ #ifndef Renderer_HPP #define Renderer_HPP -#include "PBuffer.hpp" +#include "FBO.hpp" #include "PresetFrameIO.hpp" #include "BeatDetect.hpp" #include diff --git a/src/projectM-engine/libprojectM.vcproj b/src/projectM-engine/libprojectM.vcproj index 2fa8d0e34..eedf284ce 100644 --- a/src/projectM-engine/libprojectM.vcproj +++ b/src/projectM-engine/libprojectM.vcproj @@ -218,6 +218,10 @@ RelativePath=".\Expr.cpp" > + + @@ -262,10 +266,6 @@ RelativePath=".\Parser.cpp" > - - @@ -399,6 +399,10 @@ RelativePath=".\fatal.h" > + + @@ -451,10 +455,6 @@ RelativePath=".\Parser.hpp" > - - diff --git a/src/projectM-engine/projectM.hpp b/src/projectM-engine/projectM.hpp index a5d77a2b1..507aa7e37 100755 --- a/src/projectM-engine/projectM.hpp +++ b/src/projectM-engine/projectM.hpp @@ -29,7 +29,7 @@ #ifndef _PROJECTM_H #define _PROJECTM_H -#include "PBuffer.hpp" +#include "FBO.hpp" #ifdef WIN32 #include "win32-dirent.h" diff --git a/src/projectM-wmp/projectM-wmp.suo b/src/projectM-wmp/projectM-wmp.suo index ba47e9076efe6b506187f8e63431f5c808fb1886..d333e06a869c6fecc1b0ec32cc85d783dd186679 100644 GIT binary patch delta 5420 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 T4%TwPF2ME#U~Lqr25kQVN@bG% delta 6378 zcmZvg2Y6If7RTS4yqOe22qc6ALJCckkU|0mNSTmO4Lu@a)JSM5ge=BFS!SZ3h)9_O zC@vzRU_%!2Xu6fagZiaxl z?~p~-Xen-&C7G5b7p+pK8#rE$433f0JL9E3%#wSYrD4NB(Vk|h-`Q8ZQ3!QTb=+de zB-bp94U996D9nYE!8Fp3&pXoB4aND;IS5x$aupE#;>s*|$F{Ui)I8KgRX)caIOoIH> zaf~w@Zo9yZt{BwH5Z7sp9JMl?ol*T)|5|{uLY9@@ls$&3uRYrl)-iVN*epwz)GoKd=1*gFisPBSO+i)h`Vu%(T&vtN39Bp_n)UzR4 zaQyYCqlcc>4h-;zw5-}dr}C6>M<8Qku2xo{jMYMD95f7K9A}TYO7lR0=Xv2XZn?4> zc=di%Xb(Ywz*X=WxK0@#=7VUPp+MZ@@ENyN8B_X6h;{&CoCO_$MnZpu$lTCD$ltm~ zl!Sw!ch!GSOBBWj5I^KR#5npNLA3uuWV9b3Ui%Ru;|To((VPH*I2Rnog`L=)AbP{6l`5k@7C!Hts*JOKy~fQl zgVJHP2F}$$=FvP2tWgGJ+^KPkl`&c4Fc%FI`C(`^vz6kAt{tWGgc)bp#4eizXew18cye1##j7p?)0^n`vByK3*dJKE4i95XHU47KUA;6Al4AvniK#9m^AY(1W>+KC!_CBOhwZIUmzoaB#f*DYu(EeO0+cB}e!MAF_TL9N$~&2d8xB$w%Yy&d-a7 zc<9nrh0Amx#211n(Z5Bk93eARS*sT4G z>2^B-tO{Zr55f5mZ2<)4@t;I@_>p1U)dCGJ_q&xXQq~paVr7B-wiI=y4~?nA59tpv zg=idSGH&#bK{W2gWa-cr|HcaENrgN?wn4P*5CgeK?SN>{L1g6+Q<2sHk&T7kf@ohr zWLzU(LbR_TGIs78i1s~KGGP(a1kwHnk#Uc@2+@9q$gYAeK{TcsnLj(|z(P>codH?O zLX|B63sc5LNw+(PD^g(xg&eMEGRfGtNzUe9<%!WN9Pn6;?xJiSn14e+*-aVyov3li z%5uR{l=W1`BZcP!?Fwa?@cSz3*TOsoVVc4W4eSG!sVrMr8d#39tCjTv%T+d1**LH~ zWyQ+Mz)F;jRK}$+%ET;@mnvlH@PwjGP{z!esH{xcB(Q6h1x_-uz)4oFaTCC9)VK|0~!G{9oWOW=c`jL(CDk)GPSySP^2hsS3(b8AGY|h3vtSa=j9PecF;XUOZX3BS!W$09om^SaEyj%7h zN|1`wFtPT=$%5PxS)De(cV(PR$$efDN95Q!B^w>Sp}RXQKu7tqT#b9WYNd=@6K!|BrVl=_Z!f7DohaVYdf7d4kkpS}AX(w@b>l{vX1~Bo zy3~vxA8v9M*nIzYxTf*DtRE&GJ;jlCCgX}J9m5yO?nCkNv7P9f*hxM-G$*0;g&hG$ z(a$01Z3%i?X*W;o?`k=FGNn4mpR*I=^c^Mw11^EY)>+KNnzE)$fRhquhgEr zPpp$(areuutEsWfy>jP0BmIXqUq|X78{z>-?T3E=Itaa_{4XdEL5HDNAh~!?uB=}; zcU{Gdx@7MNmUV*M{k)r%Hvi7=Y zGX}@j3-*N5(@b%1-X`C?W0_mzNZ0(jWySc$$SFws^-;^q9A=+D)%h_Vv{in5U<|*L z+chgzIc30sQdxOjRCpjKV&&U+j>)hCc@mM`BcvVr;7PeV8uta8Pa^YkBsnQT5(>`B zm_bPrT39Bxj*5|0XZuOJ{O;n;O!L1Ja82^O=tEgKng_jLL5IHBD3); z$4o?3`_~IrC$4S5%DDz5KY(utOh_7ctd{#y@EgobqXvJs8gij)oVi1a`adX34rzrkhe5Rfyk2+R4!k1+q3OQ$Dsjwej=J47>KQ$06R;B{F@@{c?2m7OAg% zT2`%HEh{G{$&5EQi}$g#y3OtgU&cXcOpo>zht11FTLQ}gv*&MXDoRcSjf2Pba|}3u z7L*2&aX03+NXvl8IC+IoPpAkYF0vzJ57X*1bDLst-iT+KovPyXi~2e%CG&`^9Z?Aud|}Q#U~B@7gAF>#C%B zV~Rw~NpdompO>OZ8ze3}PM6HTZEG*4xpCjUGGN~}yJ>%Xk%uxFuReMbF4yo#- z-NWf&E}TM z&MfR{WjvR9;vZi(d!u9=*=+pdf|wV?=ELVXSslby!A}8uxP^KAOYmt_xD;R0K(3Bs z@GDWiu8i-%+qE%oD&z8OfKU5b85`6LAE%MwKsvI{EWV_1LzS@ud6ozNVUrXx_*(ev z$@R)c!k-MEHeHz;ex)*xGQKf+l`T^?7;L$+ZOXX6Y=_Sd9}d3xDGjXGK#s!S;isT{ zPZ@814L)!FTv>1UN8r=GP{x7!7Cv7?zE{TQ{Q{qjx~yylANUn2d|>9xypy?{IC z;#b9Eqh0tj;o@i`c z#&$x%2veSF%r)2kX8kTbkjS&f%FY=$i1Fs5dO6;AqQuFKsVLA2sX0+*Mz_|QQ0v%Q zt9g4o`_O4E?!ZqdEw%)spDwl4JzF=Jl^MOTT}+7>IOz8`3>zDUDRW0f`wzZ1`Yn`b zccy=9YUm#&=DBJ9F5D#R&&`wLl}q{ZW{+*OogSWPAsBU9x1gCwg3lC4R>ql4)VQ*s zxa;6^!ad43qt~im8x(h+#;sG<7jgGG^^4vHg|1ji%NTq~z{XhAh Bl;i*a diff --git a/src/projectM-wmp/projectM-wmp/Release/BuildLog.htm b/src/projectM-wmp/projectM-wmp/Release/BuildLog.htm index b223421230ec7592a97d4255943a75fe64930244..8f439eaa9f62d5bcc33bfe85ab90a604fbc07399 100644 GIT binary patch delta 292 zcmcbR+myJ$iA~gi!GOV-!HB_}!2--O1F{V!Uz9c8+{LEDibGmnL3)#r1S4411gqu* zVG&O3(wjSFj3GKr(RFUVC~L_C)`cl0ufPq_1#%#YV>jC?-ozm_Sy%Zl*gSJgO)AmM QIHcCA>oRQ?&^o{a09mgt)&Kwi delta 438 zcmZolypX%WiA~gy!GOVn!I;4uN?QPFlg;65@vJzcPIDVGf~736=qhGnOx}E&L!FU3 zn4yFrg~5>_jiF-md@gZZTHvNRqMJ53oXvEz2d@w(*fI?1&G}+bcQ~Qz+`L`fk_oH} zLu&GAZt2MiQXgbN-gZXU$e_oN#E{5PGC7`2b90#V3Pwe|${3UwlqPQ!d#dRK^k)dr rKoA7!aKUe|oE9_Kbr{MvPgT@q5=RO-po5Yb3V@K8fotT diff --git a/src/projectM-wmp/projectM-wmp/projectM-wmp_i.c b/src/projectM-wmp/projectM-wmp/projectM-wmp_i.c index c1031b74e..3df30f729 100644 --- a/src/projectM-wmp/projectM-wmp/projectM-wmp_i.c +++ b/src/projectM-wmp/projectM-wmp/projectM-wmp_i.c @@ -6,7 +6,7 @@ /* File created by MIDL compiler version 7.00.0499 */ -/* at Mon Oct 01 11:59:33 2007 +/* at Mon Oct 01 15:17:08 2007 */ /* Compiler settings for .\projectM-wmp.idl: Oicf, W1, Zp8, env=Win32 (32b run)