mirror of
https://github.com/HarbourMasters/SpaghettiKart
synced 2026-05-31 01:16:34 -04:00
32632cacdb
* 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>
349 lines
11 KiB
C++
349 lines
11 KiB
C++
#include <libultraship.h>
|
|
#include <libultra/gbi.h>
|
|
#include "CoreMath.h"
|
|
#include <vector>
|
|
#include <memory>
|
|
|
|
#include "TestCourse.h"
|
|
#include "World.h"
|
|
#include "engine/actors/Finishline.h"
|
|
#include "engine/actors/BowserStatue.h"
|
|
#include "engine/actors/Ship.h"
|
|
#include "engine/actors/SpaghettiShip.h"
|
|
#include "engine/actors/Starship.h"
|
|
#include "engine/objects/Object.h"
|
|
#include "engine/objects/BombKart.h"
|
|
#include "assets/mario_raceway_data.h"
|
|
#include "assets/bowsers_castle_data.h"
|
|
#include "assets/bowsers_castle_displaylists.h"
|
|
#include "engine/actors/Tree.h"
|
|
#include "engine/actors/Cloud.h"
|
|
#include "engine/vehicles/Train.h"
|
|
#include "engine/objects/Trophy.h"
|
|
#include "engine/objects/CheepCheep.h"
|
|
#include "engine/objects/Snowman.h"
|
|
#include "engine/objects/TrashBin.h"
|
|
#include "engine/objects/Hedgehog.h"
|
|
#include "engine/objects/Flagpole.h"
|
|
#include "engine/objects/HotAirBalloon.h"
|
|
#include "engine/objects/Crab.h"
|
|
#include "engine/objects/Boos.h"
|
|
#include "engine/objects/GrandPrixBalloons.h"
|
|
|
|
extern "C" {
|
|
#include "main.h"
|
|
#include "camera.h"
|
|
#include "course_offsets.h"
|
|
#include "code_800029B0.h"
|
|
#include "render_courses.h"
|
|
#include "code_8006E9C0.h"
|
|
#include "code_80057C60.h"
|
|
#include "defines.h"
|
|
#include "math_util.h"
|
|
#include "external.h"
|
|
#include "code_80005FD0.h"
|
|
#include "spawn_players.h"
|
|
#include "render_objects.h"
|
|
#include "assets/common_data.h"
|
|
#include "save.h"
|
|
#include "staff_ghosts.h"
|
|
#include "actors.h"
|
|
#include "collision.h"
|
|
#include "memory.h"
|
|
#include "course.h"
|
|
extern Gfx test_course_dls[];
|
|
extern Vtx mario_Plane_001_mesh_vtx_1[];
|
|
extern Gfx mario_Plane_001_mesh[];
|
|
extern TrackWaypoint test_course_path[];
|
|
extern TrackSections test_course_addr[];
|
|
}
|
|
|
|
TestCourse::TestCourse() {
|
|
this->gfxSize = 100;
|
|
this->textures = NULL;
|
|
Props.Minimap.Texture = gTextureCourseOutlineMarioRaceway;
|
|
Props.Minimap.Width = ResourceGetTexWidthByName(Props.Minimap.Texture);
|
|
Props.Minimap.Height = ResourceGetTexHeightByName(Props.Minimap.Texture);
|
|
Props.Minimap.Pos[0].X = 260;
|
|
Props.Minimap.Pos[0].Y = 170;
|
|
Props.Minimap.PlayerX = 6;
|
|
Props.Minimap.PlayerY = 28;
|
|
Props.Minimap.PlayerScaleFactor = 0.022f;
|
|
Props.Minimap.FinishlineX = 0;
|
|
Props.Minimap.FinishlineY = 0;
|
|
Props.Minimap.Colour = {255, 255, 255};
|
|
|
|
Id = "mk:test_course";
|
|
|
|
Props.SetText(Props.Name, "Test Course", sizeof(Props.Name));
|
|
Props.SetText(Props.DebugName, "test track", sizeof(Props.DebugName));
|
|
Props.SetText(Props.CourseLength, "100m", sizeof(Props.CourseLength));
|
|
|
|
Props.AIBehaviour = D_0D008F28;
|
|
Props.AIMaximumSeparation = 50.0f;
|
|
Props.AIMinimumSeparation = 0.3f;
|
|
Props.AISteeringSensitivity = 48;
|
|
|
|
Props.NearPersp = 9.0f;
|
|
Props.FarPersp = 4500.0f;
|
|
|
|
Props.PathSizes = {51, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0};
|
|
|
|
Props.D_0D009418[0] = 4.1666665f;
|
|
Props.D_0D009418[1] = 5.5833334f;
|
|
Props.D_0D009418[2] = 6.1666665f;
|
|
Props.D_0D009418[3] = 6.75f;
|
|
|
|
Props.D_0D009568[0] = 3.75f;
|
|
Props.D_0D009568[1] = 5.1666665f;
|
|
Props.D_0D009568[2] = 5.75f;
|
|
Props.D_0D009568[3] = 6.3333334f;
|
|
|
|
Props.D_0D0096B8[0] = 3.3333332f;
|
|
Props.D_0D0096B8[1] = 3.9166667f;
|
|
Props.D_0D0096B8[2] = 4.5f;
|
|
Props.D_0D0096B8[3] = 5.0833334f;
|
|
|
|
Props.D_0D009808[0] = 3.75f;
|
|
Props.D_0D009808[1] = 5.1666665f;
|
|
Props.D_0D009808[2] = 5.75f;
|
|
Props.D_0D009808[3] = 6.3333334f;
|
|
|
|
Props.PathTable[0] = test_course_path;
|
|
Props.PathTable[1] = NULL;
|
|
Props.PathTable[2] = NULL;
|
|
Props.PathTable[3] = NULL;
|
|
|
|
Props.PathTable2[0] = test_course_path;
|
|
Props.PathTable2[1] = NULL;
|
|
Props.PathTable2[2] = NULL;
|
|
Props.PathTable2[3] = NULL;
|
|
|
|
Props.CloudTexture = (u8*) LOAD_ASSET_RAW(gTextureExhaust5);
|
|
Props.Clouds = gKalimariDesertClouds;
|
|
Props.CloudList = gLuigiRacewayClouds;
|
|
|
|
Props.Skybox.TopRight = {120, 140, 188};
|
|
Props.Skybox.BottomRight = {216, 232, 248};
|
|
Props.Skybox.BottomLeft = {216, 232, 248};
|
|
Props.Skybox.TopLeft = {40, 184, 208};
|
|
Props.Skybox.FloorTopRight = {0, 0, 0};
|
|
Props.Skybox.FloorBottomRight = {0, 0, 0};
|
|
Props.Skybox.FloorBottomLeft = {0, 0, 0};
|
|
Props.Skybox.FloorTopLeft = {0, 0, 0};
|
|
Props.Sequence = MusicSeq::MUSIC_SEQ_RACEWAYS_WARIO_STADIUM;
|
|
}
|
|
|
|
void TestCourse::Load() {
|
|
Course::Load(mario_Plane_001_mesh_vtx_1, NULL);
|
|
|
|
generate_collision_mesh_with_defaults(mario_Plane_001_mesh);
|
|
|
|
parse_course_displaylists((TrackSections*)test_course_addr);
|
|
func_80295C6C();
|
|
Props.WaterLevel = gCourseMinY - 10.0f;
|
|
}
|
|
|
|
void TestCourse::LoadTextures() {
|
|
dma_textures(gTextureTrees1, 0x0000035BU, 0x00000800U);
|
|
D_802BA058 = dma_textures(gTexturePiranhaPlant1, 0x000003E8U, 0x00000800U);
|
|
dma_textures(gTexturePiranhaPlant2, 0x000003E8U, 0x00000800U);
|
|
dma_textures(gTexturePiranhaPlant3, 0x000003E8U, 0x00000800U);
|
|
dma_textures(gTexturePiranhaPlant4, 0x000003E8U, 0x00000800U);
|
|
dma_textures(gTexturePiranhaPlant5, 0x000003E8U, 0x00000800U);
|
|
dma_textures(gTexturePiranhaPlant6, 0x000003E8U, 0x00000800U);
|
|
dma_textures(gTexturePiranhaPlant7, 0x000003E8U, 0x00000800U);
|
|
dma_textures(gTexturePiranhaPlant8, 0x000003E8U, 0x00000800U);
|
|
dma_textures(gTexturePiranhaPlant9, 0x000003E8U, 0x00000800U);
|
|
}
|
|
|
|
Path2D test_course_path2D[] = {
|
|
{ 0, 0},
|
|
{ 0, -100},
|
|
{ 0, -200},
|
|
{ 0, -300},
|
|
{ 0, -400},
|
|
{ 0, -500},
|
|
{ 0, -600},
|
|
{ 0, -700},
|
|
{ 0, -800},
|
|
{ 0, -900},
|
|
{ 0, -1000},
|
|
{ 0, -1096}, // Main point 1
|
|
{ 100, -1090},
|
|
{ 200, -1085},
|
|
{ 300, -1080},
|
|
{ 400, -1075},
|
|
{ 500, -1072}, // Curve begins to smooth here
|
|
{ 600, -1068},
|
|
{ 700, -1065},
|
|
{ 800, -1063},
|
|
{ 900, -1061},
|
|
{ 984, -1060}, // Main point 2
|
|
{ 990, -900},
|
|
{ 995, -800},
|
|
{ 997, -700},
|
|
{ 998, -600},
|
|
{ 999, -500},
|
|
{ 999, -400},
|
|
{ 999, -300},
|
|
{ 999, -200},
|
|
{ 999, -100},
|
|
{ 999, 0},
|
|
{ 999, 100},
|
|
{ 999, 200},
|
|
{ 999, 300},
|
|
{ 999, 400},
|
|
{ 999, 500},
|
|
{ 999, 600},
|
|
{ 999, 700},
|
|
{ 999, 800},
|
|
{ 999, 900},
|
|
{ 999, 940}, // Main point 3
|
|
{ 900, 945},
|
|
{ 800, 945},
|
|
{ 700, 947},
|
|
{ 600, 948},
|
|
{ 500, 949},
|
|
{ 400, 949},
|
|
{ 300, 949},
|
|
{ 200, 950},
|
|
{ 100, 950},
|
|
{ 0, 950}, // Main point 4
|
|
|
|
// End of path
|
|
{ -32768, -32768 } // Terminator
|
|
};
|
|
|
|
void TestCourse::BeginPlay() {
|
|
struct ActorSpawnData itemboxes[] = {
|
|
{ 200, 1500, 200 , 0},
|
|
{ 350, 2500, 300 , 1},
|
|
{ 400, 2000, 350 , 2},
|
|
{ 40, 0, -800, 0},
|
|
{ -40, 0, -800, 0},
|
|
{ 0, 0, -800, 0},
|
|
{ 999, 6, 482, 0},
|
|
{ 1064, 8, 275, {0}},
|
|
{ 1028, 5, -39 , {0}},
|
|
{ 320, 0, 1020, {0}},
|
|
{ 293, 0, 950, {0}},
|
|
{{ -32768, 0, 0 }, {0}},
|
|
};
|
|
|
|
struct ActorSpawnData rocks[] = {
|
|
{{ 200, 1500, 200 }, {0}},
|
|
{{ 350, 2500, 300 }, {1}},
|
|
{{ 400, 2000, 350 }, {2}},
|
|
{{ -32768, 0, 0 }, {0}},
|
|
};
|
|
|
|
spawn_all_item_boxes(itemboxes);
|
|
spawn_falling_rocks(rocks);
|
|
|
|
Vec3f test = {-100, 0, -150};
|
|
Vec3s rot = {0, 0, 0};
|
|
Vec3f vel = {0, 0, 0};
|
|
|
|
add_actor_to_empty_slot(test, rot, vel, ACTOR_TREE_MARIO_RACEWAY);
|
|
|
|
struct RailroadCrossing* rrxing;
|
|
Vec3f position;
|
|
Vec3f velocity = { 0.0f, 0.0f, 0.0f };
|
|
Vec3s rotation = { 0, 0, 0 };
|
|
vec3f_set(position, 50.0f, 2.0f, 50.0f);
|
|
|
|
Vec3f crossingPos = {0, 2, 0};
|
|
uintptr_t* crossing1 = (uintptr_t*) gWorldInstance.AddCrossing(crossingPos, 0, 2, 900.0f, 650.0f);
|
|
|
|
position[0] *= gCourseDirection;
|
|
rrxing = (struct RailroadCrossing*) GET_ACTOR(add_actor_to_empty_slot(position, rotation, velocity,
|
|
ACTOR_RAILROAD_CROSSING));
|
|
rrxing->crossingTrigger = crossing1;
|
|
|
|
Vec3f pos = {0, 80, 0};
|
|
// gWorldInstance.AddActor(new ACloud(pos));
|
|
|
|
// gWorldInstance.AddActor(new OSeagull(0, pos));
|
|
// gWorldInstance.AddActor(new OSeagull(1, pos));
|
|
// gWorldInstance.AddActor(new OSeagull(2, pos));
|
|
// gWorldInstance.AddActor(new OSeagull(3, pos));
|
|
// gWorldInstance.AddObject(new OCheepCheep(FVector(0, 40, 0), OCheepCheep::CheepType::RACE, IPathSpan(0, 10)));
|
|
// gWorldInstance.AddObject(new OTrophy(FVector(0,0,0), OTrophy::TrophyType::GOLD, OTrophy::Behaviour::GO_FISH));
|
|
//gWorldInstance.AddObject(new OSnowman(FVector(0, 0, 0)));
|
|
//gWorldInstance.AddObject(new OTrashBin(FVector(0.0f, 0.0f, 0.0f), IRotator(0, 90, 0), 1.0f, OTrashBin::Behaviour::MUNCHING));
|
|
|
|
//gWorldInstance.AddObject(new OHedgehog(FVector(0, 0, 0), FVector2D(0, -200), 9));
|
|
//gWorldInstance.AddObject(new OFlagpole(FVector(0, 0, -200), 0x400));
|
|
// gWorldInstance.AddObject(new OHotAirBalloon(FVector(0.0, 20.0f, -200.0f)));
|
|
|
|
//gWorldInstance.AddObject(new OCrab(FVector2D(0, 0), FVector2D(0, -200)));
|
|
// gWorldInstance.AddActor(new ABowserStatue(FVector(-200, 0, 0), ABowserStatue::Behaviour::CRUSH));
|
|
|
|
// gWorldInstance.AddObject(new OBoos(10, IPathSpan(0, 5), IPathSpan(18, 23), IPathSpan(25, 50)));
|
|
|
|
gVehicle2DWaypoint = test_course_path2D;
|
|
gVehicle2DWaypointLength = 53;
|
|
D_80162EB0 = spawn_actor_on_surface(test_course_path2D[0].x, 2000.0f, test_course_path2D[0].z);
|
|
|
|
//gWorldInstance.AddTrain(ATrain::TenderStatus::HAS_TENDER, 5, 2.5f, 0);
|
|
//gWorldInstance.AddTrain(ATrain::TenderStatus::HAS_TENDER, 5, 2.5f, 8);
|
|
|
|
FVector pos2 = { 0, 0, 0 };
|
|
|
|
gWorldInstance.AddObject(new OBombKart(pos2, &D_80164550[0][25], 25, 4, 0.8333333f));
|
|
gWorldInstance.AddObject(new OBombKart(pos2, &D_80164550[0][45], 45, 4, 0.8333333f));
|
|
|
|
gWorldInstance.AddActor(new AShip(FVector(0, 0, 0), AShip::Skin::SHIP3));
|
|
|
|
gWorldInstance.AddObject(new OGrandPrixBalloons(FVector(0, 0, 0)));
|
|
}
|
|
|
|
void TestCourse::WhatDoesThisDo(Player* player, int8_t playerId) {
|
|
if (((s16) gNearestWaypointByPlayerId[playerId] >= 0x19B) &&
|
|
((s16) gNearestWaypointByPlayerId[playerId] < 0x1B9)) {
|
|
if (D_80165300[playerId] != 1) {
|
|
func_800CA288(playerId, 0x55);
|
|
}
|
|
D_80165300[playerId] = 1;
|
|
} else {
|
|
if (D_80165300[playerId] != 0) {
|
|
func_800CA2B8(playerId);
|
|
D_80165300[playerId] = 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
void TestCourse::WhatDoesThisDoAI(Player* player, int8_t playerId) {
|
|
if (((s16) gNearestWaypointByPlayerId[playerId] >= 0x19B) &&
|
|
((s16) gNearestWaypointByPlayerId[playerId] < 0x1B9)) {
|
|
if (D_80165300[playerId] != 1) {
|
|
func_800CA2E4(playerId, 0x55);
|
|
}
|
|
D_80165300[playerId] = 1;
|
|
} else {
|
|
if (D_80165300[playerId] != 0) {
|
|
func_800CA30C(playerId);
|
|
D_80165300[playerId] = 0;
|
|
}
|
|
}
|
|
}
|
|
|
|
void TestCourse::Render(struct UnkStruct_800DC5EC* arg0) {
|
|
gSPSetGeometryMode(gDisplayListHead++, G_SHADING_SMOOTH);
|
|
gSPClearGeometryMode(gDisplayListHead++, G_LIGHTING);
|
|
set_track_light_direction(D_800DC610, D_802B87D4, 0, 1);
|
|
gSPTexture(gDisplayListHead++, 0xFFFF, 0xFFFF, 0, G_TX_RENDERTILE, G_ON);
|
|
gSPSetGeometryMode(gDisplayListHead++, G_SHADING_SMOOTH);
|
|
|
|
if (func_80290C20(arg0->camera) == 1) {
|
|
gDPSetCombineMode(gDisplayListHead++, G_CC_SHADE, G_CC_SHADE);
|
|
gDPSetRenderMode(gDisplayListHead++, G_RM_AA_ZB_OPA_SURF, G_RM_AA_ZB_OPA_SURF2);
|
|
// d_course_big_donut_packed_dl_DE8
|
|
}
|
|
gSPDisplayList(gDisplayListHead++, mario_Plane_001_mesh);
|
|
}
|
|
|
|
bool TestCourse::IsMod() {
|
|
return true;
|
|
} |