mirror/SpaghettiKart
1
0
Fork 0
mirror of https://github.com/HarbourMasters/SpaghettiKart synced 2026-07-11 07:25:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add new logo to hm intro

Browse Source
This commit is contained in:
MegaMech
2025-04-25 08:09:39 -06:00
parent 2b9acc677f
commit 69fc2f6f8e
3 changed files with 24 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/HM_Intro.cpp
+18 -3
View File
@@ -55,10 +55,16 @@ void HarbourMastersIntro::HM_InitIntro() {
_hRot = IRotator(0, -45.0f, 0);
_hScale = {2.0f, 2.0f, 2.0f};
lusPos = FVector(0, -400, -614); // 12, 190, -1000
lusRot = IRotator(0, 0, 0);
lusScale = FVector(1, 1, 1);
ground_f3d_material_013_lights = gdSPDefLights1(
0x7F, 0x30, 0x80,
0x60, 20, 10, 0x49, 0x49, 0x49
);
gEditor.AddObject("lus", &lusPos, &lusRot, &lusScale, nullptr, 1, Editor::GameObject::CollisionType::BOUNDING_BOX, 10, &DespawnValue, -1);
}
void HarbourMastersIntro::HM_TickIntro() {
@@ -72,9 +78,13 @@ void HarbourMastersIntro::HM_TickIntro() {
HarbourMastersIntro::Bob(_ship2Pos, _ship2Rot, 1.2f, 0.06f, 1.6f, -0.04f, 1.1f, -0.04f);
_pos.x += 9;
_camera.Pos.x -= 1;
if (lusPos.y < -60) {
lusPos.y += 3;
}
//_camera.Pos.x -= 1;
if (_pos.x >= 880) {
// SWITCH TO NEXT MENU LOGO_INTRO_MENU
if (_pos.x >= 1100) {
gMenuFadeType = 0;
gMenuSelection = LOGO_INTRO_MENU;
gFadeModeSelection = FADE_MODE_LOGO;
@@ -132,11 +142,16 @@ void HarbourMastersIntro::HM_DrawIntro() {
render_set_position(mtx_geo, 0);
gSPDisplayList(gDisplayListHead++, ground_map_mesh);
gSPDisplayList(gDisplayListHead++, powered_Text_mesh);
//gSPDisplayList(gDisplayListHead++, powered_Text_mesh); // Replaced by poweredbylus
gSPDisplayList(gDisplayListHead++, castle_map_002_mesh);
gSPDisplayList(gDisplayListHead++, road_map_001_mesh);
gSPDisplayList(gDisplayListHead++, water_water1_mesh);
Mat4 lusMtx;
ApplyMatrixTransformations(lusMtx, lusPos, lusRot, lusScale);
render_set_position(lusMtx, 0);
gSPDisplayList(gDisplayListHead++, (Gfx*)"__OTR__hmintro/poweredbylus");
HarbourMastersIntro::Sync();
}
src/engine/HM_Intro.h
+5
View File
@@ -57,6 +57,11 @@ private:
FVector _hPos;
IRotator _hRot;
FVector _hScale;
FVector lusPos;
IRotator lusRot;
FVector lusScale;
int32_t DespawnValue = 0;
};
extern "C" {
src/port/ui/ContentBrowser.cpp
+1 -1
View File
@@ -261,7 +261,7 @@ namespace Editor {
}
void ContentBrowserWindow::FindContent() {
auto ptr = GameEngine::Instance->context->GetResourceManager()->GetArchiveManager()->ListFiles({"*tracks/*","actors/*", "objects/*"}, {""});
auto ptr = GameEngine::Instance->context->GetResourceManager()->GetArchiveManager()->ListFiles({"hmintro/*", "*tracks/*","actors/*", "objects/*"}, {""});
if (ptr) {
auto files = *ptr;
for (const auto& file : files) {