Changes:
Make Timer SmartCtor ClangFormat Reactivate Graphical Error Screen Fix Logger Fix Image Rendering
This commit is contained in:
		| @@ -26,12 +26,9 @@ int main() { | ||||
|   RD7::FadeIn(); | ||||
|   // RD7::Init::NdspFirm(); | ||||
|   RD7::Scene::Load(std::make_unique<Sample>()); | ||||
|   auto img = RD7::Image::New(); | ||||
|   img->Load("romfs:/icons/icon.png"); | ||||
|   RD7::Ftrace::End("app", "app_init"); | ||||
|   while (RD7::MainLoop()) { | ||||
|     RD7::R2()->OnScreen(R2Screen_Top); | ||||
|     UI7::GetForegroundList()->AddImage(R7Vec2(), img); | ||||
|     RD7::R2()->OnScreen(R2Screen_Bottom); | ||||
|     RD7::Ftrace::Beg("app", "app_mainloop"); | ||||
|     if (d7_hDown & KEY_START) { | ||||
|       RD7::FadeOut(); | ||||
|   | ||||
| @@ -41,14 +41,14 @@ static void Wave(int index, R7Vec2 position, R7Vec2 size, float time, | ||||
|   } | ||||
|   // Just to make sure... | ||||
|   y_position = std::min(y_position, position.y + size.y - (90 - shrink)); | ||||
|    | ||||
|     RD7::R2()->AddTriangle( | ||||
|         R7Vec2(x_position, y_position), | ||||
|         R7Vec2(x_position + 300, y_position + (90 - shrink)), | ||||
|         R7Vec2(x_position - 300, y_position + (90 - shrink)), | ||||
|         RD7::Color::RGBA(.94f - .17f * color_effect, .61f - .25f * color_effect, | ||||
|                          .36f + .38f * color_effect) | ||||
|             .toRGBA()); | ||||
|  | ||||
|   RD7::R2()->AddTriangle( | ||||
|       R7Vec2(x_position, y_position), | ||||
|       R7Vec2(x_position + 300, y_position + (90 - shrink)), | ||||
|       R7Vec2(x_position - 300, y_position + (90 - shrink)), | ||||
|       RD7::Color::RGBA(.94f - .17f * color_effect, .61f - .25f * color_effect, | ||||
|                        .36f + .38f * color_effect) | ||||
|           .toRGBA()); | ||||
| } | ||||
|  | ||||
| void DrawWave(R7Vec2 position, R7Vec2 size, float time, bool dbg) { | ||||
| @@ -60,7 +60,9 @@ void DrawWave(R7Vec2 position, R7Vec2 size, float time, bool dbg) { | ||||
| R7Vec2 testv2 = R7Vec2(48, 48); | ||||
| std::vector<int*> img; | ||||
|  | ||||
| void display_icon(void* v, R7Vec2 p) { RD7::R2()->AddRect(p, testv2, 0xff00ffff); } | ||||
| void display_icon(void* v, R7Vec2 p) { | ||||
|   UI7::Menu::GetList()->AddRectangle(p, testv2, 0xff00ffff); | ||||
| } | ||||
|  | ||||
| Sample::Sample() { | ||||
|   auto ti = new int; | ||||
|   | ||||
		Reference in New Issue
	
	Block a user