From 32632cacdb316d7f2d3b6ecdb634f0ef9aebadf0 Mon Sep 17 00:00:00 2001 From: MegaMech Date: Wed, 14 May 2025 18:30:32 -0600 Subject: Impl new intro (#193) * Update menus * Update CMakeLists.txt * Add Ship * Impl hm ship actors * Update HM course * Impl new intro * Finish intro scene * Rename * Start Editor Work * raycast works * Fix ScreenRayTrace in widescreen * Basic Actor Picking * wip * Editor use vtx collision * gizmo work * otr works for object picking * Impl objects for editor * actor init * Update * Add all axis move (freemove) * Docking Windows works here * Setup imgui layout for editor * Editor Snap to Ground works * Basic Scene Explorer Works * Editor get actor names * Impl editor object names * impl Editor Play and Pause buttons * Editor translate works while paused * Fix freecam lighting * Added adjustable track properties to editor * Editor matrix, icons, rotation, impl light * Setup Track Properties 1 * Editor tooling wip * Load modded o2rs * Don't enable hud if editor is enabled * Updates * SceneManager nearly working * Fix mario kart 64 intro logo sizing * Fix Rotator * Finish new matrix translation code * Cleanup headers * Cleanup * Cleanup 2 * Cleanup 3 * Prevent divize by zero crash * Add visible circle for translate in all axis * Editor scaling/rot works properly now * Scale All_Axis evenly * Fixes to includes to work on Linux. * Removed overfilled arguments in gfx_create_framebuffer() * Added missing function definitions to Game.h * Editor sun face the camera * Add rotation model to gizmo * Add new handles * Failed attempt at transforming collision * Impl water volume * Import fast64 paths * water surface * Scene Setup 1 * Custom Track O2R almost working needs testing * Custom Track Load path O2r * Render custom track. Wip collision * Add missing function * Debug Spawning Custom O2R Track * Import courses working now * Fix memory leak * Remove New Track Button * Engine.cpp more consistent with sf64 * Fix Editor Enable Button * Editor Accurate mouse click drag objects * Editor selects closest object and cleanup * Gizmo rot and scale collision working * Remove constexpr from IRotator * Impl properties for location/rot/scale * Better Properties display, swap rot handles * Fix content browser dock and editor now disabled by default * Remove GameInfoWindow, Multiplayer Button, and FPS Slider * Disable Editor when its disabled * Add new logo to hm intro * Fix pause menu item box cursor * Remove minimap from Course::from_json and to_json * Impl Import Minimap * Fix custom minimap rendering * minimap uses extension .png * Refactor minimap * Freecam only for player 1 * GrandPrix Balloons work in custom track * Track Id is now std::string and outside of Props * Moved editor assets to be included in ship.o2r * Fixed GenerateO2R to package the correct folder and save to the correct filename * Linux specific changes. * Added "#include " that required them * Changed how the "ship.o2r" file is loaded to allow it to load the file from within appimages. * Changed the Linuxdeploy version to avoid errors later when the Github Actions creates appimages(same fix applied to other ports.) * Revert "Moved editor assets to be included in ship.o2r" This reverts commit 05704c01f761baa67a83e357d9765f5c6b5e3fdb. * Added back files(this time without LUS changes) * Changed workflow file to use correct filename for assets file. * Missed a few spots in the workflow file. * Added .desktop file and made corrections to the main workflow. * Added the rest of upstream CMakeLists.txt * disabled USE_NETWORKING * New InverseMatrix * Renamed both .o2r files to be more accurate to its contents. * Reverted CmakeList.txt --------- Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com> Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com> --- src/engine/objects/BombKart.cpp | 39 ++++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 19 deletions(-) (limited to 'src/engine/objects/BombKart.cpp') diff --git a/src/engine/objects/BombKart.cpp b/src/engine/objects/BombKart.cpp index fc27103ed..53b4a4262 100644 --- a/src/engine/objects/BombKart.cpp +++ b/src/engine/objects/BombKart.cpp @@ -29,7 +29,8 @@ extern s8 gPlayerCount; size_t OBombKart::_count = 0; -OBombKart::OBombKart(Vec3f pos, TrackWaypoint* waypoint, uint16_t waypointIndex, uint16_t state, f32 unk_3C) { +OBombKart::OBombKart(FVector pos, TrackWaypoint* waypoint, uint16_t waypointIndex, uint16_t state, f32 unk_3C) { + Name = "Bomb Kart"; _idx = _count; Vec3f _pos = {0, 0, 0}; @@ -41,10 +42,10 @@ OBombKart::OBombKart(Vec3f pos, TrackWaypoint* waypoint, uint16_t waypointIndex, // Set height to the default value of 2000.0f unless Pos[1] is higher. // This allows placing these on very high surfaces. - f32 height = (pos[1] > 2000.0f) ? pos[1] : 2000.0f; - _pos[0] = pos[0]; - _pos[1] = spawn_actor_on_surface(pos[0], height, pos[2]); - _pos[2] = pos[2]; + f32 height = (pos.y > 2000.0f) ? pos.y : 2000.0f; + _pos[0] = pos.x; + _pos[1] = spawn_actor_on_surface(pos.x, height, pos.z); + _pos[2] = pos.z; } WaypointIndex = waypointIndex; @@ -72,7 +73,7 @@ OBombKart::OBombKart(Vec3f pos, TrackWaypoint* waypoint, uint16_t waypointIndex, WheelPos[3][2] = _pos[2]; check_bounding_collision(&_Collision, 2.0f, _pos[0], _pos[1], _pos[2]); - find_unused_obj_index(&ObjectIndex); + find_unused_obj_index(&_objectIndex); _count++; } @@ -329,7 +330,7 @@ void OBombKart::Tick() { void OBombKart::Draw(s32 cameraId) { if (gModeSelection == BATTLE) { for (size_t playerId = 0; playerId < NUM_BOMB_KARTS_BATTLE; playerId++) { - Object* object = &gObjectList[ObjectIndex]; + Object* object = &gObjectList[_objectIndex]; if (object->state != 0) { s32 primAlpha = object->primAlpha; Player* player = &gPlayerOne[playerId]; @@ -337,9 +338,9 @@ void OBombKart::Draw(s32 cameraId) { object->pos[1] = player->pos[1] - 2.0; object->pos[2] = player->pos[2]; object->surfaceHeight = player->unk_074; - func_800563DC(ObjectIndex, cameraId, primAlpha); - func_8005669C(ObjectIndex, cameraId, primAlpha); - func_800568A0(ObjectIndex, cameraId); + func_800563DC(_objectIndex, cameraId, primAlpha); + func_8005669C(_objectIndex, cameraId, primAlpha); + func_800568A0(_objectIndex, cameraId); } } return; @@ -358,27 +359,27 @@ void OBombKart::Draw(s32 cameraId) { } Camera* camera = &camera1[cameraId]; if (cameraId == PLAYER_ONE) { - if (is_obj_flag_status_active(ObjectIndex, 0x00200000) != 0) { + if (is_obj_flag_status_active(_objectIndex, 0x00200000) != 0) { Unk_4A = 0; } else if (gGamestate != ENDING) { Unk_4A = 1; } - clear_object_flag(ObjectIndex, 0x00200000); + clear_object_flag(_objectIndex, 0x00200000); } // huh??? s32 state = State; if (State != States::DISABLED) { - gObjectList[ObjectIndex].pos[0] = Pos[0]; - gObjectList[ObjectIndex].pos[1] = Pos[1]; - gObjectList[ObjectIndex].pos[2] = Pos[2]; - s32 temp_s4 = func_8008A364(ObjectIndex, cameraId, 0x31C4U, 0x000001F4); - if (is_obj_flag_status_active(ObjectIndex, VISIBLE) != 0) { - set_object_flag(ObjectIndex, 0x00200000); + gObjectList[_objectIndex].pos[0] = Pos[0]; + gObjectList[_objectIndex].pos[1] = Pos[1]; + gObjectList[_objectIndex].pos[2] = Pos[2]; + s32 temp_s4 = func_8008A364(_objectIndex, cameraId, 0x31C4U, 0x000001F4); + if (is_obj_flag_status_active(_objectIndex, VISIBLE) != 0) { + set_object_flag(_objectIndex, 0x00200000); D_80183E80[0] = 0; D_80183E80[1] = func_800418AC(Pos[0], Pos[2], camera->pos); D_80183E80[2] = 0x8000; - func_800563DC(ObjectIndex, cameraId, 0x000000FF); + func_800563DC(_objectIndex, cameraId, 0x000000FF); OBombKart::SomeRender(camera->pos); if (((u32) temp_s4 < 0x4E21U) && (state != BOMB_STATE_EXPLODED)) { OBombKart::LoadMtx(); -- cgit v1.2.3