mirror/SpaghettiKart
1
0
Fork 0
mirror of https://github.com/HarbourMasters/SpaghettiKart synced 2026-08-29 09:30:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Impl new intro (#193)

Browse Source 
* 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 <stdio.h>" 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 05704c01f7.

* 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>
This commit is contained in:
MegaMech
2025-05-14 18:30:32 -06:00
committed by GitHub
parent 70f049cb6c
commit 32632cacdb
374 changed files with 43640 additions and 11666 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_80005FD0.c
+42 -35
View File
@@ -36,6 +36,7 @@
#include <assets/kalimari_desert_data.h>
#include <assets/frappe_snowland_data.h>
#include <assets/dks_jungle_parkway_data.h>
#include <stdio.h>
#include "port/Game.h"
#include "engine/courses/Course.h"
@@ -1166,33 +1167,33 @@ void func_80008424(s32 playerId, f32 arg1, Player* player) {
#ifdef NON_MATCHING
// generated by m2c commit 05102b12b75400ad2be8bd0872404237b36e1702 on Feb-20-2024
// static ? D_800DCAF4; /* unable to generate initializer: unknown type */
// static ? D_800DCB34; /* unable to generate initializer: unknown type */
// static ? gAIDistances; /* unable to generate initializer: unknown type */
// static ? gMarioRacewayAIDistances; /* unable to generate initializer: unknown type */
// static ? *D_800DCBB4[0x15] = {
// &D_800DCB34,
// &D_800DCAF4,
// &D_800DCAF4,
// &D_800DCAF4,
// &D_800DCAF4,
// &D_800DCAF4,
// &D_800DCAF4,
// &D_800DCAF4,
// &D_800DCAF4,
// &D_800DCAF4,
// &D_800DCAF4,
// &D_800DCAF4,
// &D_800DCAF4,
// &D_800DCAF4,
// &D_800DCAF4,
// &D_800DCAF4,
// &D_800DCAF4,
// &D_800DCAF4,
// &D_800DCAF4,
// &D_800DCAF4,
// &D_800DCAF4,
// &gMarioRacewayAIDistances,
// &gAIDistances,
// &gAIDistances,
// &gAIDistances,
// &gAIDistances,
// &gAIDistances,
// &gAIDistances,
// &gAIDistances,
// &gAIDistances,
// &gAIDistances,
// &gAIDistances,
// &gAIDistances,
// &gAIDistances,
// &gAIDistances,
// &gAIDistances,
// &gAIDistances,
// &gAIDistances,
// &gAIDistances,
// &gAIDistances,
// &gAIDistances,
// &gAIDistances,
// };
s32 func_800088D8(s32 playerId, s16 arg1, s16 arg2) {
s32 func_800088D8(s32 playerId, s16 lapNum, s16 currRank) {
Player* player;
f32 interp;
s16 rank;
@@ -1212,10 +1213,10 @@ s32 func_800088D8(s32 playerId, s16 arg1, s16 arg2) {
if (gModeSelection == 1) {
return true;
}
if (arg1 < 0) {
if (lapNum < MIN_LAPS) {
return true;
} else if (arg1 >= 4) {
arg1 = 3;
} else if (lapNum > MAX_LAPS) {
lapNum = MAX_LAPS;
}
if (D_80163330[playerId] == 1) {
return true;
@@ -1224,9 +1225,9 @@ s32 func_800088D8(s32 playerId, s16 arg1, s16 arg2) {
if (player->type & 0x4000) {
return true;
}
arg1_times_8 = arg1 * 8;
temp_a3 = &CM_GetProps()->SomePtr[arg1_times_8];
if (arg2 == 0) {
arg1_times_8 = lapNum * 8;
temp_a3 = &CM_GetProps()->AIDistance[arg1_times_8];
if (currRank == 0) {
if (gDemoMode == 1) {
temp_a2 = D_80164450[playerId] - D_80164450[D_80164378[7]];
if (temp_a2 < 0) {
@@ -1269,17 +1270,17 @@ s32 func_800088D8(s32 playerId, s16 arg1, s16 arg2) {
}
var_v0 = 0;
for (i = 0; i < 2; i++) {
if (gGPCurrentRaceRankByPlayerId[D_80163344[i]] < arg2) {
if (gGPCurrentRaceRankByPlayerId[D_80163344[i]] < currRank) {
var_v0++;
}
}
var_a0_4 = 0;
for (i = 0; i < gPlayerCount; i++) {
if (gGPCurrentRaceRankByPlayerId[i] < arg2) {
if (gGPCurrentRaceRankByPlayerId[i] < currRank) {
var_a0_4++;
}
}
var_t1 = (arg2 - var_v0) - var_a0_4;
var_t1 = (currRank - var_v0) - var_a0_4;
if (var_v0 > 0 || var_a0_4 > 0) {
var_t1++;
}
@@ -1721,7 +1722,7 @@ void func_80009B60(s32 playerId) {
// gNearestWaypointByPlayerId[playerId] might need to be saved to a temp
D_80164510[playerId] = D_80164550[D_80163448][gNearestWaypointByPlayerId[playerId]].posY + 4.3f;
if ((D_801631F8[playerId] == 1) && (D_801631E0[playerId] == 0)) {
func_8002E4C4(player);
set_player_height(player);
}
if (D_801631E0[playerId] == 1) {
player->pos[1] = D_80164510[playerId];
@@ -3635,7 +3636,13 @@ void func_800100F0(s32 pathIndex) {
pathDest = D_80164550[pathIndex];
bInvalidPath = 1;
if (GetCourse() != GetPodiumCeremony()) {
var_v0 = process_path_data(pathDest, CM_GetProps()->PathTable2[pathIndex]);
TrackWaypoint* pathSrc = CM_GetProps()->PathTable2[pathIndex];
if (pathSrc == NULL) {
printf("code_80005FD0.c: Path %d in Course::PathTable2, was NULL.\n Your track is missing a path\n", pathIndex);
}
var_v0 = process_path_data(pathDest, pathSrc);
gWaypointCountByPathIndex[pathIndex] = (u16) var_v0;
} else {
// Course path included in course_data which has already been loaded into memory.