diff options
| author | MegaMech <MegaMech@users.noreply.github.com> | 2025-05-14 18:30:32 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-14 18:30:32 -0600 |
| commit | 32632cacdb316d7f2d3b6ecdb634f0ef9aebadf0 (patch) | |
| tree | d374a84675fc0f49100c275aa34828bc9db538f8 /src/engine/actors/ATree.cpp | |
| parent | 70f049cb6c326dede27e0ba7e88ac0d67b7651a4 (diff) | |
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 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>
Diffstat (limited to 'src/engine/actors/ATree.cpp')
| -rw-r--r-- | src/engine/actors/ATree.cpp | 66 |
1 files changed, 0 insertions, 66 deletions
diff --git a/src/engine/actors/ATree.cpp b/src/engine/actors/ATree.cpp deleted file mode 100644 index fa1c7f580..000000000 --- a/src/engine/actors/ATree.cpp +++ /dev/null @@ -1,66 +0,0 @@ -#include "ATree.h" - -#include <libultra/gbi.h> - -extern "C" { -#include "common_structs.h" -#include "math_util.h" -#include "main.h" -#include "actors.h" -} - -ATree::ATree(Vec3f pos, Gfx* displaylist, f32 drawDistance, f32 minDrawDistance, const char* tlut = nullptr) { - Pos[0] = pos[0]; - Pos[1] = pos[1]; - Pos[2] = pos[2]; - - Displaylist = displaylist; - Tlut = tlut; - DrawDistance = drawDistance; - MinDrawDistance = minDrawDistance; -} - -void ATree::Tick() { - if (((Flags & 0x800) == 0) && ((Flags & 0x400) != 0)) { - Pos[1] = Pos[1] + 4.0f; - if (Pos[1] > 800.0f) { - Flags |= 0x800; - } - } -} - -void ATree::Draw(Camera* camera) { - f32 dist; - - if ((Flags & 0x800) != 0) { - return; - } - - dist = is_within_render_distance(camera->pos, Pos, camera->rot[1], 0, gCameraZoom[camera - camera1], - DrawDistance); - - if (CVarGetInteger("gNoCulling", 0) == 1) { - dist = MAX(dist, 0.0f); - } - - if (dist < 0.0f) { - return; - } - - if (((Flags & 0x400) == 0) && (dist < MinDrawDistance)) { - func_8029794C(Pos, Rot, 3.0f); - } - sBillBoardMtx[3][0] = Pos[0]; - sBillBoardMtx[3][1] = Pos[1]; - sBillBoardMtx[3][2] = Pos[2]; - - if (render_set_position(sBillBoardMtx, 0) != 0) { - if (Tlut) { - gDPLoadTLUT_pal256(gDisplayListHead++, Tlut); - } - gSPDisplayList(gDisplayListHead++, Displaylist); - } -} - -void ATree::Collision(Player* player, AActor*) { } -void ATree::Destroy() { } |
