mirror of
https://github.com/HarbourMasters/SpaghettiKart
synced 2026-08-25 16:15:53 -04:00
Implement SpawnParams struct (#536)
* Impl SpawnParams * Added json submodule * Update json * Update * Works * Remove comment * Works refactor * Snowman and thwomp working * Impl hot air balloon * More progress * All OObjects are done * cleanup * Refactor 2Dpath to normal path * Update nlohmann json & fix compile * Rest of actors * MORE CHANGES * Finish actors * Done PR, some fix to collision viewer * Impl falling rocks * Add const * wip editor refactor * Property work * continue * Overridable editor properties * Actor saving/loading works now * Fix light alignment * Clarification * Impl penguin * params impl signs * properties impl falling rock * More property impls * impl air balloon * Add spawnParams to OObject Translate * Snowman translate better * impl hedgehog properly * properties impl trophy * thwomp progress * Finish impl properties * Fix compile * Fix cursor collisions * Move registered actors * Rename pathPoint XYZ to xyz * Fix editor pause bug * Clean up * Review comments * Remove SpawnParams struct from actor classes * Rename * Player Label First Iteration * Work now * Working 3d text * Fix boo bug * Finish AText actor * Fix spawnparams compile * Register AText * Finish Text Actor * Fix thwomp interpolation * Fix compile * Fix crab and hedgehog * Fix loading flagpole * Fix Hot Air Balloon * Turn zbuffer on for AText * Update --------- Co-authored-by: MegaMech <7255464+MegaMech@users.noreply.github.com>
This commit is contained in:
+26
-53
@@ -1,59 +1,32 @@
|
||||
// #include <vector>
|
||||
// #include <functional>
|
||||
// #include <iostream>
|
||||
// #include <map>
|
||||
#include <functional>
|
||||
#include <unordered_map>
|
||||
#include <string>
|
||||
|
||||
// #include "Registry.h"
|
||||
// #include "Course.h"
|
||||
// #include "port/Game.h"
|
||||
#include "Registry.h"
|
||||
#include "engine/CoreMath.h"
|
||||
|
||||
// template <class T> Registry<T>::Registry() {
|
||||
// }
|
||||
extern "C" {
|
||||
#include "actors.h"
|
||||
#include "actor_types.h"
|
||||
}
|
||||
|
||||
// template <class T> void Registry<T>::Add(std::string id, std::function<T*()> fn) {
|
||||
// // need to handle duplicate registration
|
||||
// ContentVault[id] = fn;
|
||||
// }
|
||||
std::unordered_map<std::string, ActorRegistryEntry> gActorRegistry;
|
||||
|
||||
// template <class T>
|
||||
// void Registry<T>::AddArgs(std::string id) {
|
||||
// ArgsVault[id] = [](Args&&... args) -> T* {
|
||||
// return new T(std::forward<Args>(args)...);
|
||||
// };
|
||||
// }
|
||||
void RegisterActor(const std::string& name,
|
||||
std::function<void(const SpawnParams&)> spawnFunc)
|
||||
{
|
||||
gActorRegistry[name] = { spawnFunc };
|
||||
}
|
||||
|
||||
// template <class T>
|
||||
// T* Registry<T>::Get(std::string id) {
|
||||
// auto it = ContentVault.find(id);
|
||||
// if (it != ContentVault.end()) {
|
||||
// return it->second();
|
||||
// }
|
||||
// return nullptr;
|
||||
// }
|
||||
void Registry_SpawnActor(SpawnParams& params) {
|
||||
auto it = gActorRegistry.find(params.Name);
|
||||
if (it != gActorRegistry.end() && it->second.spawnFunc) {
|
||||
printf("[Registry] Spawned %s\n", params.Name.c_str());
|
||||
it->second.spawnFunc(params);
|
||||
}
|
||||
}
|
||||
|
||||
// // Available Registries
|
||||
// Registry<Course> Courses;
|
||||
// Registry<Cup> Cups;
|
||||
// Registry<AActor> Actors;
|
||||
|
||||
// void AddCourse(std::string id, Course* course) {
|
||||
// Courses.Add(id, [course]() { return course; });
|
||||
// course->Id = id;
|
||||
// }
|
||||
|
||||
// void AddCup(std::string id, Cup* cup) {
|
||||
// Cups.Add(id, [cup]() { return cup; });
|
||||
// //cup->Id = id;
|
||||
// }
|
||||
|
||||
// void AddActor(std::string id, AActor* actor) {
|
||||
// Actors.Add(id, [actor]() { return actor; });
|
||||
// }
|
||||
|
||||
// void AddStockContent() {
|
||||
// AddActor("mk:banana", new AMarioSign({0, 0, 0}));
|
||||
// }
|
||||
|
||||
// template class Registry<Course>;
|
||||
// template class Registry<Cup>;
|
||||
// template class Registry<AActor>;
|
||||
// @arg name Must be a resource name such as mk:car
|
||||
bool Registry_Find(const std::string& name) {
|
||||
return gActorRegistry.find(name) != gActorRegistry.end();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user