Browse Source

Various small cleanups.

Darryl Pogue 10 years ago
parent
commit
00ad401191
  1. 12
      Sources/Plasma/PubUtilLib/plPipeline/hsWinRef.h
  2. 12
      Sources/Plasma/PubUtilLib/plScene/plPageTreeMgr.cpp
  3. 4
      Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp

12
Sources/Plasma/PubUtilLib/plPipeline/hsWinRef.h

@ -43,16 +43,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#ifndef hsWinRef_inc
#define hsWinRef_inc
#include "HeadSpin.h"
#ifdef HS_BUILD_FOR_WIN32
typedef HWND hsWinRef;
#else // Whatever
typedef void* hsWinRef;
#endif
typedef hsWindowHndl hsWinRef;
#endif // hsWinRef_inc

12
Sources/Plasma/PubUtilLib/plScene/plPageTreeMgr.cpp

@ -356,7 +356,7 @@ bool plPageTreeMgr::IRenderSortingSpans(plPipeline* pipe, hsTArray<plDrawVisList
plDrawable* drawable = drawList[pairs[i].fDrawable]->fDrawable;
listTrav = &scratchList[iSort++];
listTrav->fBody = (void*)*(uint32_t*)&pairs[i];
listTrav->fBody = (void*)&pairs[i];
listTrav->fNext = listTrav + 1;
if( drawable->GetNativeProperty(plDrawable::kPropSortAsOne) )
@ -404,7 +404,7 @@ bool plPageTreeMgr::IRenderSortingSpans(plPipeline* pipe, hsTArray<plDrawVisList
listTrav = sortedList;
while( listTrav )
{
plDrawSpanPair& curPair = *(plDrawSpanPair*)&listTrav->fBody;
plDrawSpanPair& curPair = *(plDrawSpanPair*)listTrav->fBody;
drawList[curPair.fDrawable]->fVisList.Append(curPair.fSpan);
listTrav = listTrav->fNext;
}
@ -423,14 +423,14 @@ bool plPageTreeMgr::IRenderSortingSpans(plPipeline* pipe, hsTArray<plDrawVisList
#if 0
listTrav = sortedList;
plDrawSpanPair& curPair = *(plDrawSpanPair*)&listTrav->fBody;
plDrawSpanPair& curPair = *(plDrawSpanPair*)listTrav->fBody;
int curDraw = curPair.fDrawable;
visList.Append(curPair.fSpan);
listTrav = listTrav->fNext;
while( listTrav )
{
curPair = *(plDrawSpanPair*)&listTrav->fBody;
curPair = *(plDrawSpanPair*)listTrav->fBody;
if( curPair.fDrawable != curDraw )
{
pipe->Render(drawList[curDraw]->fDrawable, visList);
@ -447,7 +447,7 @@ bool plPageTreeMgr::IRenderSortingSpans(plPipeline* pipe, hsTArray<plDrawVisList
pipe->Render(drawList[curDraw]->fDrawable, visList);
#else
listTrav = sortedList;
plDrawSpanPair& curPair = *(plDrawSpanPair*)&listTrav->fBody;
plDrawSpanPair& curPair = *(plDrawSpanPair*)listTrav->fBody;
int curDraw = curPair.fDrawable;
listTrav = listTrav->fNext;
@ -458,7 +458,7 @@ bool plPageTreeMgr::IRenderSortingSpans(plPipeline* pipe, hsTArray<plDrawVisList
while( listTrav )
{
curPair = *(plDrawSpanPair*)&listTrav->fBody;
curPair = *(plDrawSpanPair*)listTrav->fBody;
if( curPair.fDrawable != curDraw )
{
pipe->Render(drawList[curDraw]->fDrawable, visList);

4
Sources/Plasma/PubUtilLib/plStatusLog/plStatusLog.cpp

@ -60,15 +60,13 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "hsThread.h"
#include "hsTemplates.h"
#include "hsTimer.h"
#include "hsWindows.h"
#include "plStatusLog.h"
#include "plUnifiedTime/plUnifiedTime.h"
#include "plProduct.h"
#include "plEncryptLogLine.h"
#if HS_BUILD_FOR_WIN32
#include <shlobj.h>
#endif
//////////////////////////////////////////////////////////////////////////////
//// plStatusLogMgr Stuff ////////////////////////////////////////////////////

Loading…
Cancel
Save