Commit Graph

901 Commits

Author SHA1 Message Date
MegaMech d3a3e761cf Remove unused submodules (#226)
* Update .gitmodules

* Delete import
2025-06-16 16:33:31 -06:00
MegaMech f6e2f12371 Update CMakeLists.txt (#223) 2025-06-15 22:24:41 -06:00
sitton76 03717deeed Changed imgui text for clarity. (#221)
* Added notice for incomplete feature.

* Other imgui changes.

Gave "Modify Interpolation Target FPS" a unique tooltip

Changed text for HM64 labs to be WIP

Made "Far Frustrum" hide if "gNoCulling" is disabled.

Renamed gImprovements to gBetterResultPortraits

* Made more sliders hidden when the option related to them is disabled.

* Adjusted linebreaks in the WIP label.

* Update PortMenu.cpp

---------

Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
2025-06-15 22:20:08 -06:00
MegaMech 9fe391a2a4 Fix More Interpolation (#220)
* Fix SetTextMatrix Interpolation (flashing text)

* Interpolate pause menu item box

* Interp mtxf_translation_x_y_rotate_z_scale_x_y

* Fix billboarding for freecam

* Fix menus battle mode back to grand prix bug

* Fix snow interp

* interp star clouds
2025-06-15 22:17:24 -06:00
sitton76 547d651cc4 Fixed Wario Stadium jumbotron(50, 100, and 150 CC) (#222) 2025-06-15 00:43:30 -06:00
MegaMech 44db9bab77 Add Interpolation (#204)
* initial work

* more work

* progress

* Fixed slow fps

* Add Lywx changes

* Interp Works

* Test default tick/logic update

* Added missing include (#202)

* Added missing include

* More missing includes

---------

Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>

* test

* Revert "test"

This reverts commit 1a810d74cc.

* Interp Item box

* Actually interpolate item box

* fix clouds

* interp player?

* Test 2

* Fix mistake

* tag and fix item boxes

* tag fake item box and whatever func_800696CC is

* these aren't needed

* tag karts

* Slightly better falling rocks(still needs work)

* Tag Smoke and Dust

* Removed unneeded code from falling_rock

* tag whatever func_80051ABC is

* add missing rotate x coord

* GrandPrixBallon/kart shadow

* Green shells tag, and added comments I neglected to add before.

* doesn't compile on win

* Fixes

* Disabled camera interpolation

* Balloons fixes

* progress

* set_transform_matrix compiles

* Compile setTransformMatrix

* More transforms interp

* Add more interps

* matrix

* Matrix multi interp

* Fix interpolation camera bug

* Missing includes needed for Linux.

* Excluded access to HM64 Labs on Switch.

* interpolation tags for various objects

* Bowser castle statue flame interpolated.

* tag hedgehogs

* cloud interpolation

* Interpolated smoke particles from shells

* cloud interpolation refactor

* Interpolated snowflakes

* Interpolated penguins, also added comment tags to places I missed.

* tag Snowman interpolation

* Interpolated player reflection(sherbet land)

* Forgot to uncomment stuff while testing

* better tag

* tag leaves

* Set the default FPS to 30

* tag hud

* Fixed "Match Refresh Rate" option

* adjust draw distance

* remove innecessary rock tag

* rag rocks

* better tag

* Tagged player rank placement in HUD

* Tagged Bat, Boos, and TrashBin(Banshee Boardwalk objects)

* Refactor render_screens and fix editor raycast

* better object interpolation

* shift is not needed here

* fix tag

* fix tags

* mole comments

* comment

* Changed how shell flames are interpolated.

* interpolated ended scene fireworks.

* Tagged star particles in the ending scene

* Shell flames handled better.

* this isn't needed

* Fix multiplayer cameras

* Fixed loading battle maps.

* Tagged battle balloons

* Some fixes for battle mode

* No longer needed changes toAFinishline with the changes mega made.

* Tag finishline

* fix to make it compile with cmake 3.31

* changed mtxf_multiplication() to fix vert explosion in Desert & DK parkway.(provided by Coco.)

* fix memory leaks, avoid invalidate texture (#207)

* Fixed macos

* More stupid fixes

* update with main and update torch and lus and enable action on this branch

* Update FrameInterpolation.h

* Update FrameInterpolation.cpp

* fix some memory leak

* Update torch

* Update torch

* update torch and lus

* reduce texture import

* don't use fork of torch and lus

* Update torch

* Update torch

---------

Co-authored-by: Lywx <kiritodev01@gmail.com>

* Refactor World::Courses to unique_ptr (#211)

* wip course unique ptr

* Track unique_ptr : This probably compiles

* Finish impl Courses as unique_ptr

* Fix error

* Fixes

* More fixes

* Cleanup

* Remove old vars

---------

Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>

* particle boat and train

* fix player particle interpolation

* add modify interpolation target fps in menu

* fix windows

* Update libultraship

* Fix logo interp

* Interp SetTextMatrix

* Fix freecam camera

* Clarify comment

* Clarify func

* fix linux compilation

* Update Thwomp.cpp

* Update Thwomp.h

* Update render.inc.c

* Update render.inc.c

* Update gbiMacro.c

* interp falling rock shadow

* Revert change that has no explanation

* Update code_80057C60.c

* Update code_80057C60.c

* Update GrandPrixBalloons.cpp

* Update Lakitu.cpp

* Update framebuffer_effects.c

* Update render_courses.c

---------

Co-authored-by: Sonic Dreamcaster <alejandro.asenjo88@gmail.com>
Co-authored-by: KiritoDv <kiritodev01@gmail.com>
Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com>
Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>
Co-authored-by: coco875 <59367621+coco875@users.noreply.github.com>
Co-authored-by: coco875 <pereira.jannin@gmail.com>
2025-06-07 21:38:12 -06:00
briaguya a67fbb6442 bump lus (#203) 2025-05-20 11:15:36 -06:00
wowjinxy f5f7c01c3b Removed Jumbotron triggers on Luigi Raceway 2025-05-17 13:43:00 -05:00
KiritoDv 987573949f More stupid fixes 2025-05-15 22:45:37 -06:00
Lywx 27a421bbab Fixed macos 2025-05-15 22:12:56 -06:00
KiritoDv 26ec8eebfe Removed stupid registers 2025-05-15 21:26:57 -06:00
KiritoDv 159315d1e9 First batch of deleting shit 2025-05-15 21:09:52 -06:00
MegaMech b9e1f0fa38 Fix EditorMatrix (#201)
* Fix build

* Fix EditorMatrix

* Corrected name of built application on the linux workflow file

* Enable jumbotron

---------

Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com>
2025-05-15 21:04:35 -06:00
KiritoDv df26c3d727 Fixed workflow not starting 2025-05-15 21:04:20 -06:00
KiritoDv 9e30f21232 Disable some workflows 2025-05-15 21:02:39 -06:00
KiritoDv 15e250164b Fixed switch to use ConfigVersion 2025-05-15 21:01:26 -06:00
KiritoDv 882ce6a9f3 Update torch to 8e56ea0294973b7c9f8f077a131b40fce13b8489 2025-05-15 20:53:42 -06:00
Lywx ef0f314de4 Fixed mac again 2025-05-15 20:43:39 -06:00
Lywx bdf5ca8d60 Updated MacOS build 2025-05-15 20:43:18 -06:00
Sonic Dreamcaster 3d72ff1a3d fix linux 2025-05-15 22:16:41 -03:00
Sonic Dreamcaster 3b19a6105e fix windows 2025-05-15 22:14:59 -03:00
MegaMech 7cc9894aa1 Fix compile (#199)
* Fixes made so far

* Fixes up until linking

* Moved GetInterpreter() to a single function under the Engine.h

* Updated shader files included with assets, added exception for Linux for including SDL2_net

* Removed osSetTime stub(for now)

* Adjustments to get it to compile + run

* Decoupled GetInterpreter() from the GameEngine Class, corrected a invalid include in SpaghettiGui.cpp

---------

Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com>
2025-05-15 15:25:18 -06:00
MegaMech e7415ec072 Fixes made so far (#198)
* Fixed compile

* Moved GetInterpreter() to a single function under the Engine.h
2025-05-15 10:30:39 -06:00
MegaMech 0e35858050 Fix build (#197) 2025-05-15 10:26:06 -06:00
MegaMech 32632cacdb 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 <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>
2025-05-14 18:30:32 -06:00
KiritoDv 70f049cb6c Fixed executable name 2025-03-07 18:53:07 -06:00
KiritoDv f56a0849b0 Fixed compilation error 2025-03-07 18:42:30 -06:00
KiritoDv d65d58922a Fixed MacOS Build 2025-03-07 18:32:15 -06:00
KiritoDv 9cbd401047 Pushed YAMLs to fix CI 2025-03-07 18:31:54 -06:00
KiritoDv 0637f8c52b Added a new platform 2025-03-07 18:16:07 -06:00
KiritoDv 9f46fcb26f Fixed some compilation issues 2025-03-07 18:00:41 -06:00
KiritoDv 5f8550790a Fixed compilation 2025-03-07 18:00:41 -06:00
MegaMech 629125110d a 2025-03-07 17:35:16 -06:00
MegaMech 1f2000846a Update lus 2025-03-07 17:35:16 -06:00
MegaMech 85471fb7e1 update lus branch 2025-03-07 17:35:16 -06:00
MegaMech 6a629fcaa9 Add Ship (#191)
* Compile works now

* Update menus

* Update CMakeLists.txt

* Add Ship

* Impl hm ship actors

* Update HM course
2025-02-10 15:05:53 -07:00
MegaMech a6ecc276e9 Impl Reset button and fix some naming (#190)
* Compile works now

* Update menus

* Update CMakeLists.txt
2025-02-08 13:38:59 -07:00
KiritoDv 6eb0ee294b Updated packaging cmake 2025-02-08 11:15:26 -06:00
KiritoDv 6406b0679e Removed license for now 2025-02-08 11:12:47 -06:00
KiritoDv 91292d3757 Updated cmake again 2025-02-08 10:54:19 -06:00
KiritoDv 844777c399 Updated hash 2025-02-08 10:47:33 -06:00
KiritoDv f5158c8d4c Updating README.md 2025-02-08 10:46:29 -06:00
MegaMech 922b69e504 Compile works now (#189) 2025-02-07 23:49:06 -07:00
MegaMech bb90ff8531 Fix Compile (#188)
* Fix freecam rotation smoothing

* Configure freecam controller

* Fix cont z button and impl freecam on/off events

* Add torch static comp

* Fixed cmake

* Copied yamls

* Fixed cmake

* Added github workflows

* Update CMakeLists.txt

---------

Co-authored-by: KiritoDv <kiritodev01@gmail.com>
2025-02-07 23:48:36 -07:00
MegaMech 008d527ed5 Torch Static Compile (#187)
* Fix freecam rotation smoothing

* Configure freecam controller

* Fix cont z button and impl freecam on/off events

* Add torch static comp

* Fixed cmake

* Copied yamls

---------

Co-authored-by: KiritoDv <kiritodev01@gmail.com>
2025-02-07 22:24:00 -07:00
MegaMech 7fe7052270 Finish Freecam (#186)
* Fix freecam rotation smoothing

* Configure freecam controller

* Fix cont z button and impl freecam on/off events
2025-02-07 19:27:44 -07:00
MegaMech fc1e1a9782 Reimpl star emitter (#180)
* Reimpl star emitter

* Remove OObject Lists

* wip mole reimpl

* nearly fix moles

* Cleanup

* Update reimpl seagull

* Rework finishline to auto spawn and not to run in credits

* Fix train crossing direction in extra mode

* Clarification

* micro optimization

* update mole

---------

Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>
2025-02-07 14:36:55 -07:00
coco875 6f8cbc0279 fix a matrix (#185)
* fix a matrix

* remove LOAD_ASSET
2025-02-07 14:30:36 -07:00
coco875 8e0e95d7d1 fix a problem with cmake and fix animation in menu (#184) 2025-02-04 15:08:50 -07:00
Malkierian 695879c4cb Modern Menu (#183)
* Add modern menu.
Add and include LUS cvars .cmake file for macro usage in modern menu.

* Un-ignore new .cmake

* Copy new Resolution Editor stuff from 2ship (incomplete).
Fix fullscreen checkbox.
Finish changes for new UIWidgets.
Cleanup ShipUtils.

* Remove duplicate asm-differ entry from .gitmodules.

* Re-implement Freecam options.

* Cleanup freecam character follow buttons.
Partially re-implement Multiplayer window as enhancement sidebar (needs text input widget to finish).
Cleanup disables.

---------

Co-authored-by: MegaMech <MegaMech@users.noreply.github.com>
2025-02-04 11:43:20 -07:00