From 94521a65488bee2c5d4ad66ae2eb2ec4e0fec9dc Mon Sep 17 00:00:00 2001 From: psperl Date: Mon, 1 Oct 2007 18:12:51 +0000 Subject: [PATCH] windows updates git-svn-id: https://projectm.svn.sourceforge.net/svnroot/projectm/trunk@495 6778bc44-b910-0410-a7a0-be141de4315d --- src/projectM-engine/Renderer.hpp | 6 +++ src/projectM-engine/TextureManager.cpp | 18 +++---- src/projectM-engine/libprojectM.vcproj | 72 ++++++++++++++----------- src/projectM-wmp/projectM-wmp.suo | Bin 54784 -> 56320 bytes 4 files changed, 54 insertions(+), 42 deletions(-) diff --git a/src/projectM-engine/Renderer.hpp b/src/projectM-engine/Renderer.hpp index 0fa0485ec..13f7451da 100644 --- a/src/projectM-engine/Renderer.hpp +++ b/src/projectM-engine/Renderer.hpp @@ -16,9 +16,15 @@ #endif #ifdef USE_FTGL +#ifdef WIN32 +#include +#include +#include +#else #include #include #include +#endif #endif /** USE_FTGL */ class BeatDetect; diff --git a/src/projectM-engine/TextureManager.cpp b/src/projectM-engine/TextureManager.cpp index 9a670c7fb..dc5ef68f3 100644 --- a/src/projectM-engine/TextureManager.cpp +++ b/src/projectM-engine/TextureManager.cpp @@ -11,9 +11,7 @@ TextureManager::TextureManager(const std::string _presetURL): presetURL(_presetU } TextureManager::~TextureManager() -{ - // DeleteAllTextures(); - +{ std::map::const_iterator iter; for(iter = textures.begin(); iter != textures.end(); iter++) @@ -62,21 +60,21 @@ GLuint TextureManager::getTexture(const std::string imageURL) fullURL.c_str(), SOIL_LOAD_AUTO, SOIL_CREATE_NEW_ID, - SOIL_FLAG_POWER_OF_TWO - //| SOIL_FLAG_MIPMAPS - | SOIL_FLAG_MULTIPLY_ALPHA - | SOIL_FLAG_COMPRESS_TO_DXT + + // SOIL_FLAG_POWER_OF_TWO + // SOIL_FLAG_MIPMAPS + // SOIL_FLAG_MULTIPLY_ALPHA + SOIL_FLAG_COMPRESS_TO_DXT //| SOIL_FLAG_DDS_LOAD_DIRECT ); textures[imageURL]=tex; return tex; - } - // return LoadTexture(fullUrl.c_str(),false); + } } unsigned int TextureManager::getTextureMemorySize() { - return 0;//GetTotalTextureSize(); + return 0; } diff --git a/src/projectM-engine/libprojectM.vcproj b/src/projectM-engine/libprojectM.vcproj index f72fc3870..2fa8d0e34 100644 --- a/src/projectM-engine/libprojectM.vcproj +++ b/src/projectM-engine/libprojectM.vcproj @@ -42,11 +42,11 @@ + + - - @@ -226,6 +230,14 @@ RelativePath=".\IdlePreset.cpp" > + + + + @@ -258,10 +270,6 @@ RelativePath=".\PCM.cpp" > - - @@ -303,17 +311,17 @@ > + + - - @@ -339,10 +347,6 @@ RelativePath=".\BeatDetect.hpp" > - - @@ -407,6 +411,14 @@ RelativePath=".\IdlePreset.hpp" > + + + + @@ -447,10 +459,6 @@ RelativePath=".\PCM.hpp" > - - @@ -496,17 +504,17 @@ > + + - - diff --git a/src/projectM-wmp/projectM-wmp.suo b/src/projectM-wmp/projectM-wmp.suo index a8f8085c0bc61c19d443f342dc678906c65d2ebe..ba47e9076efe6b506187f8e63431f5c808fb1886 100644 GIT binary patch delta 3097 zcmZ9OeNa?Y7{>3td-v{wxGv%c2q=h>m7}1Wih{0!lPMF3A82VRnwphjF^)0XZdo&q z;}^VBsWoGRWtvP1*Azcn0~Lr$%bCi*()z=uFSTu^p^~2Ga&UHf_2E3{ch5QZp7)%4 z?uP4K;U?FyG*|!mnx-v*?sau_%|clWEtFhW*5Vm(<JK_S_3@`Jqq2E2G<#1cyz^}`DUx`0tvn-)n>aDgiY4ueEmZb z@tU&HUF@9(gxhyXq<(~ieWv}FyTkPI&i82~4mAFn%bf{o*jIgbb&u|b@7+CA)L$ws zi8)f0h_X6IuaG|zORP9F=+)hzs;_fFqJ2xGxjI*>l1eQ;Rg!brjwY3wRv*;+tLDii zQs^(JO)2zfLx6n>r-ZGUsE$atJ5$Eu~*zgqOKb(NQT1EJ|SILtHrxVAlsW8fL?^eNlg_^ri^dXrFGCTY0675ojbSYO%QW$P%5OuPM9>n9U{d5_ahAsgJ}s+hT}NVIZzVB z4Zy1hAaVvb0htL^K)A89xMWQFE@%Q&1NF2!0zUw%AFLp6*9ftGQZWo@e-g~|8Q0y? z`FLBL&S!IGfu*;jC6!+D7zVUgFZk9Yeb)!=@X~N^xp`u!Y-rvl!S!i&usx#7+EW4B zUs>d8tg152wL&?&{wpgaqmgU&;rKoRHy^eNN~wLll4 zOVDMg6>5Xpq0gWWh~vjZ&5{d^)iVquL2Z>y*9=41&2y!-dZZoQoM4C%E|Q#@czO8B zP-%HFU;KOK%DY>9c18HEQTJNBOxs;1yUV@u(Uvj^t{W$%I|oSd&KxP*Jy`~?jh7?G z`$_W2O?4j`vg}-1Xth>}f0~wgC*gAx&T=sGUWm&ZAH#aXCqi6KJioKttfxZ#6l2NY z!t{sOj!Vv^&4f~*p1#-uGo8+p6wF1*!^D7k_7LA59wcPTAa>>hWI&8C#4Kv^Qd4R= z4=A=63l&3*QmDJdjX_!RRpmBuT}Z=gcFJ4Y!s~3`6Zx_^J5wJcSItZbCIzgIadDI` zy01`jOpmmDULby70KU)ve7-)~)@!@mjqlu!H-{JONaq_@Tj&ktV`z^Wz86Z~EfZpr z8B7cr=f~vmof!#{l|eiY7^5LFF3c1t3z`a%6+k%$4D+6&q`ZI$f$;3xel z`=vv(bc;!t>})A(J6g7DcIRP_DYgAa*`tsBXkz3ft;)UDkfTQfvg>k#)Lfk};k_C5 zhCK%jX?bOh{5HTZopVN+qtIO<8|viz+tb9qzSu54aojEb_Ix}4(_}r=Gf&PX6XHQR z4C1qLp4?cB*$^4qZH74Sm!TfE6`p%zn_}#{5MsOqIjic_oIm^YP0r*)i%z3H6pBC` zY%a72V*Cz~&4+G73@-rLBTyU-B26*w-b{Gz?A#bO7M>40Q8B&=1@IHKkfu#nkgq^G zJY%L}kzZOK%~{Mf;yuN`OG(>Ofj~d2hW)-RE)nu=BRcRiUq-zD;82L8!W8YYYs#H^8jC0uue7P z*YSOL&iI^S?0i7Aizvn{d;_0>@;k-Yw;7&&Zz(n${sKJXXT_MPJA5*}p?@gI0sn>P zL)}x11O5un0lO4Sh5rSfVc-I@!oFU39xw5Vkq?CD+mfsp$1@f4C@5Xc)15=7NPWjz zO06kqm*0H`9fUokNoPyDH6C`7L(>{y??Mbq(|NBIP9;ezxBX{tyK6g&EFO4M)u0`v zRw1hX?rOB7#G~_ENbJ7JEnIrlkm~GVdf@)4z8i3*Zg*a^%-ZAo?fqXY^Mv@pa$y3D z)R;*PhG#N|D8?kEsdjT?+LgmIcOk`?oO#N>64P#rYFDG!2()|E%`*e>hJy5O!t;FD zqZn7>G(6`XQH;yo4!;y-hho#=_rf!#pi|E(*24$D8WkhI3jYAguPvNz1k0cxAj9jy Quk0e{d&h5H_jk|tAB?Lr;{X5v delta 1272 zcmY+DZD?Cn7{~9qIp;Rb?y{uqYPx1xE3`#6$+o&$yV^MNq3$I~OWC?PXWffdnKjmn z)UiqI1VJRW`Om3anL6-gqoT_(Qelk9g03?{C&l?eiijWj(UmKVAlB!^+-x5Bk^B74 zInT*?o_musuH>}q%b;uZGL6SHP1{CnCw35fvB7oUz&|vzo1#Ht52516>31J7MC>P? zBn}XpiNnM};%P!fo zgdK<(>>e`S+lv~KMlYFTL0N2=b*b#qUOVR&Ye+U$mf0<|Q=NF1qomcESiy6LUzo$< z#t2`$S+o(_^cz=&MO}NFdx8>_f=K&5^E?F?%0f=JkLis)lO1o6DBWMR=b&b3JGJ%n zG$MOCW*H)9Ec~6S$3kiihWbp*begE^@?pMnUFq%`o;uNiL?g$6cMH<&suyZ{k18`G zOrnWUU2Gv7*H(6K-r?RVJCt1m{jMd{I7z6BYk2WQD?)u~>>ss{h>U9*m#a z{J;9${k8|bms(`>lA+6A-ydY`0m)7+3&ckcA(gE`FzuGFesxwy?&WiMZf0v{>Q4_( zgtLFZ*Hs64k9VpXZXpDrhKEqDpHT0z8ut>)bra2m8m)wKn+R2ZHP)4HQitTHw^*}$ z<+JTfbkIb%b45e7#bB~{zKSEny>ivWO(sKEs~AFw8rkqg(S^^yzaQP#ucXJLFo%P( z{+m<6ZD>p#b_i4R>*a&r{UGqsjb