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>

1 files changed, 15 insertions, 2 deletions

diff --git a/src/engine/World.h b/src/engine/World.h
index 9490293b7..bb8979090 100644
--- a/src/engine/World.h
+++ b/src/engine/World.h
@@ -18,20 +18,26 @@
 #include <memory>
 #include <unordered_map>
 #include "Actor.h"
+#include "StaticMeshActor.h"
 #include "particles/ParticleEmitter.h"
 
+#include "editor/Editor.h"
+#include "editor/GameObject.h"
+
 extern "C" {
 #include "camera.h"
 #include "objects.h"
 };
 
-class OObject;
 class Cup; // <-- Forward declaration
+class OObject;
 class Course;
+class StaticMeshActor;
 class AVehicle;
 class OBombKart;
 class TrainCrossing;
 class OLakitu;
+class GameObject; // <-- Editor
 
 class World {
     typedef struct {
@@ -49,12 +55,17 @@ public:
 
     AActor* AddActor(AActor* actor);
     struct Actor* AddBaseActor();
+    void AddEditorObject(Actor* actor, const char* name);
     AActor* GetActor(size_t index);
 
     void TickActors();
     AActor* ConvertActorToAActor(Actor* actor);
     Actor* ConvertAActorToActor(AActor* actor);
 
+    void DrawStaticMeshActors();
+    StaticMeshActor* AddStaticMeshActor(std::string name, FVector pos, IRotator rot, FVector scale, std::string model, int32_t* collision);
+    void DeleteStaticMeshActors();
+
     OObject* AddObject(OObject* object);
 
     void TickObjects();
@@ -76,6 +87,7 @@ public:
     void SetCourseFromCup();
 
     World* GetWorld(void);
+    void ClearWorld(void);
 
 
     // These are only for browsing through the course list
@@ -85,7 +97,6 @@ public:
 
     Matrix Mtx;
 
-    // Holds all available courses
 
     Course* CurrentCourse;
     Cup* CurrentCup;
@@ -93,6 +104,7 @@ public:
     std::vector<Cup*> Cups;
     size_t CupIndex = 1;
 
+    std::vector<StaticMeshActor*> StaticMeshActors;
     std::vector<AActor*> Actors;
     std::vector<OObject*> Objects;
     std::vector<ParticleEmitter*> Emitters;
@@ -105,6 +117,7 @@ public:
     TrainCrossing* AddCrossing(Vec3f position, u32 waypointMin, u32 waypointMax, f32 approachRadius, f32 exitRadius);
     std::vector<std::shared_ptr<TrainCrossing>> Crossings;
 
+    // Holds all available courses
     std::vector<Course*> Courses;
     size_t CourseIndex = 0; // For browsing courses.
 private: