FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged changed to osgParticle from Macro, these add the ability to

Browse Source 
orientate the particles to predefined axis.
This commit is contained in:
Robert Osfield
2002-07-22 13:05:31 +00:00
parent 3dd07ea354
commit f007e7c3be
4 changed files with 112 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/osg/MemoryManager.cpp
View File

@@ -260,8 +260,6 @@ sMStats m_getMemoryStatistics()
m_breakOnAllocation(value);
}
}
if( (ptr = getenv("OSG_MM_CHECK_ON_ALLOCATIONS")) != 0)
{
@@ -499,19 +497,25 @@ sMStats m_getMemoryStatistics()
// Fill the remainder
unsigned int shiftCount = 0;
char *cptr = (char *) lptr;
unsigned char *cptr = (unsigned char *) lptr;
for (i = 0; i < (length & 0x3); i++, cptr++, shiftCount += 8)
{
if (*cptr == static_cast<char>((pattern >> shiftCount) & 0xff)) ++numMatching;
if (*cptr == static_cast<unsigned char>((pattern >> shiftCount) & 0xff)) ++numMatching;
else ++numNotMatching;
}
if (numMatching>0 && !allocUnit->printedOutUnintializedInfo)
{
// possible unitialized data?
printf("Warning: possible uninitilized memory numMatching=%d numNotMatching=%d\n",numMatching,numNotMatching);
printf("Warning: possible uninitilized memory numMatching=%d numNotMatching=%d length=%d\n",numMatching,numNotMatching,length);
printf(" allocationNumber=%d sourceFile '%s' sourceLine=%d\n",allocUnit->allocationNumber,allocUnit->sourceFile,allocUnit->sourceLine);
// cptr = ((unsigned char *)allocUnit->reportedAddress);
// for (i = 0; i < length; i++, cptr++)
// {
// std::cout<<" "<<i<<" " << std::hex << (unsigned int) *cptr << std::dec <<std::endl;
// }
allocUnit->printedOutUnintializedInfo=true;
return false;