Re #320 Fixed the Windows side of r3527.

git-svn-id: https://svn.code.sf.net/p/speed-dreams/code/trunk@3528 30fe4595-0a0c-4342-8851-515496e4dcbd

Former-commit-id: a7f81d88feb8ba5b811628ba6f7275991ccbcaac
Former-commit-id: 5328e7d46e71954312bf492e2440abb5e7450403
This commit is contained in:
pouillot 2011-05-01 20:51:02 +00:00
parent 4d9832156f
commit 894494017b

View file

@ -98,7 +98,7 @@ static void onAccept(void *)
!= GfSCR_ATT_MULTISAMPLING_DISABLED);
if (VecMultiSampleTexts[NCurMultiSampleIndex] != GfSCR_ATT_MULTISAMPLING_DISABLED)
GfglFeatures::self().select(GfglFeatures::MultiSamplingSamples,
(int)pow(2, NCurMultiSampleIndex));
(int)pow(2.0, (double)NCurMultiSampleIndex));
// Store settings from the GL features layer to the graph.xml file.
GfglFeatures::self().storeSelection();
@ -303,7 +303,6 @@ static void onActivate(void * /* dummy */)
}
}
// OpenGL menu
void* OpenGLMenuInit(void *prevMenu)
{
@ -372,7 +371,7 @@ void* OpenGLMenuInit(void *prevMenu)
{
const int nMaxSamples =
GfglFeatures::self().getSupported(GfglFeatures::MultiSamplingSamples);
NMultiSamples += (int)(log(nMaxSamples) / log(2));
NMultiSamples += (int)(log((double)nMaxSamples) / log(2.0));
std::ostringstream ossVal;
for (int nVal = 2; nVal <= nMaxSamples; nVal *= 2)
{
@ -380,7 +379,6 @@ void* OpenGLMenuInit(void *prevMenu)
ossVal << nVal << "x";
VecMultiSampleTexts.push_back(ossVal.str());
}
GfLogDebug("OpenGLMenuInit: nMaxSamples=%d, NMultiSamples=%d, VecMultiSampleTexts.size=%u\n", nMaxSamples, NMultiSamples, VecMultiSampleTexts.size());
}
return ScrHandle;