インデント修正

git-svn-id: file:///Volumes/Transfer/gigaleak_20231201/2020-05-23%20-%20ctr.7z%20+%20svn_v1.068.zip/ctr/svn/ctr_Repair@396 385bec56-5757-e545-9c3a-d8741f4650f1
This commit is contained in:
N2614 2011-07-26 04:28:16 +00:00
parent 1103dd42a9
commit 73d360afce

View File

@ -38,17 +38,17 @@
namespace namespace
{ {
const s32 s_GxHeapSize = 0x800000; const s32 s_GxHeapSize = 0x800000;
uptr s_GxHeap; uptr s_GxHeap;
demo::RenderSystemDrawing s_RenderSystem; demo::RenderSystemDrawing s_RenderSystem;
ScrollBuffer s_scrollBufferInstance; ScrollBuffer s_scrollBufferInstance;
ScrollBuffer *s_scrollBuffer; ScrollBuffer *s_scrollBuffer;
char s_updaterBuffer[1<<20] NN_ATTRIBUTE_ALIGN(4096); char s_updaterBuffer[1 << 20] NN_ATTRIBUTE_ALIGN(4096);
// デモの初期化 // デモの初期化
void Initialize() void Initialize()
{ {
// NuiShellの初期化 (CUPに必須) // NuiShellの初期化 (CUPに必須)
NN_UTIL_PANIC_IF_FAILED(nn::ns::CTR::InitializeForShell()); NN_UTIL_PANIC_IF_FAILED(nn::ns::CTR::InitializeForShell());
@ -80,69 +80,70 @@ const s32 s_GxHeapSize = 0x800000;
InitializeHeap(); InitializeHeap();
// 描画インスタンスの初期化 // 描画インスタンスの初期化
s_GxHeap = reinterpret_cast<uptr>(ForceAllocate(s_GxHeapSize));s_RenderSystem s_GxHeap = reinterpret_cast<uptr>(ForceAllocate(s_GxHeapSize));
.Initialize(s_GxHeap, s_GxHeapSize); s_RenderSystem.Initialize(s_GxHeap, s_GxHeapSize);
// 描画インスタンスの初期化 // 描画インスタンスの初期化
s_scrollBufferInstance.Initialize(&s_RenderSystem); s_scrollBufferInstance.Initialize(&s_RenderSystem);
s_scrollBuffer=&s_scrollBufferInstance; s_scrollBuffer = &s_scrollBufferInstance;
// GPU利用宣言 // GPU利用宣言
nn::applet::AssignGpuRight(); nn::applet::AssignGpuRight();
} }
// 消費時間取得用関数群 // 消費時間取得用関数群
s64 s_StartTick; s64 s_StartTick;
void SetTick() void SetTick()
{ {
s_StartTick=nn::os::Tick::GetSystemCurrent(); s_StartTick = nn::os::Tick::GetSystemCurrent();
} }
s64 GetConsumedMillisec() s64 GetConsumedMillisec()
{ {
s64 endTick=nn::os::Tick::GetSystemCurrent(); s64 endTick = nn::os::Tick::GetSystemCurrent();
nn::os::Tick consumed(endTick-s_StartTick); nn::os::Tick consumed(endTick - s_StartTick);
return ((nn::fnd::TimeSpan)consumed).GetMilliSeconds(); return ((nn::fnd::TimeSpan) consumed).GetMilliSeconds();
} }
// 動いていることを知らせるための、くるくる画面表示取得用メソッド // 動いていることを知らせるための、くるくる画面表示取得用メソッド
const char s_progress[]="-\\|/"; const char s_progress[] = "-\\|/";
s32 s_progressIndex = 0; s32 s_progressIndex = 0;
char GetProgressChar() char GetProgressChar()
{ {
s_progressIndex=(s_progressIndex+1)%(sizeof(s_progress)-1); s_progressIndex = (s_progressIndex + 1) % (sizeof(s_progress) - 1);
return s_progress[s_progressIndex]; return s_progress[s_progressIndex];
} }
nn::Result UpdateSequence(bool *isHandledError, bool* needUpdate) nn::Result UpdateSequence(bool *isHandledError, bool* needUpdate)
{ {
nn::Result result; nn::Result result;
nn::Result lastResult=nn::ResultSuccess(); nn::Result lastResult = nn::ResultSuccess();
/********************* CUPの初期化 *******************/ /********************* CUPの初期化 *******************/
s_scrollBuffer->AppendText("Initializing Cup Library")->Render(); s_scrollBuffer->AppendText("Initializing Cup Library")->Render();
SetTick(); // 初期化開始前の時間をセット SetTick(); // 初期化開始前の時間をセット
result=nn::cup::CTR::Initialize(s_updaterBuffer,sizeof(s_updaterBuffer)); result = nn::cup::CTR::Initialize(s_updaterBuffer, sizeof(s_updaterBuffer));
if (result == nn::cup::CTR::ResultUpdatePartitionNotFound()) if (result == nn::cup::CTR::ResultUpdatePartitionNotFound())
{ {
s_scrollBuffer->AppendText(" - Update Partition Not Found (%lldmsec)", GetConsumedMillisec())->Render(); s_scrollBuffer->AppendText(" - Update Partition Not Found (%lldmsec)", GetConsumedMillisec())->Render();
s_scrollBuffer->AppendText("")->Render(); s_scrollBuffer->AppendText("")->Render();
*isHandledError=true; *isHandledError = true;
return result; return result;
} }
if (result == nn::cup::CTR::ResultUpdateNotRequired()) if (result == nn::cup::CTR::ResultUpdateNotRequired())
{ {
s_scrollBuffer->AppendText(" - Already Updated (%lldmsec)", GetConsumedMillisec())->Render(); s_scrollBuffer->AppendText(" - Already Updated (%lldmsec)", GetConsumedMillisec())->Render();
s_scrollBuffer->AppendText("")->Render(); s_scrollBuffer->AppendText("")->Render();
*isHandledError=true; *isHandledError = true;
return result; return result;
} }
if (result == nn::cup::CTR::ResultInvalidUpdatePartitionFormat()) if (result == nn::cup::CTR::ResultInvalidUpdatePartitionFormat())
{ {
s_scrollBuffer->AppendText(" - Invalid Update Partition (%lldmsec)", GetConsumedMillisec())->Render(); s_scrollBuffer->AppendText(" - Invalid Update Partition (%lldmsec)", GetConsumedMillisec())->Render();
s_scrollBuffer->AppendText("")->Render(); s_scrollBuffer->AppendText("")->Render();
*isHandledError=true; *isHandledError = true;
return result; return result;
}NN_UTIL_RETURN_IF_FAILED(result); }
NN_UTIL_RETURN_IF_FAILED(result);
s_scrollBuffer->AppendText(" - Need Update (%lldmsec)", GetConsumedMillisec())->Render(); s_scrollBuffer->AppendText(" - Need Update (%lldmsec)", GetConsumedMillisec())->Render();
*needUpdate = true; *needUpdate = true;
@ -154,7 +155,7 @@ s32 s_progressIndex = 0;
NN_UTIL_RETURN_IF_FAILED(nn::cup::CTR::Finalize()); NN_UTIL_RETURN_IF_FAILED(nn::cup::CTR::Finalize());
return lastResult; return lastResult;
} }
} }
nn::Result ExecuteCup(ScrollBuffer* scrollBuf, bool* needUpdte) nn::Result ExecuteCup(ScrollBuffer* scrollBuf, bool* needUpdte)