mirror/SpaghettiKart
1
0
Fork 0
mirror of https://github.com/HarbourMasters/SpaghettiKart synced 2026-06-04 18:59:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

load course dl textures from otr and move objects

Browse Source
This commit is contained in:
MegaMech
2024-12-05 21:41:58 -07:00
parent 7628e98e37
commit 19135c9ee8
60 changed files with 654 additions and 752 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/World.cpp
+21 -20
View File
@@ -9,10 +9,11 @@
#include "vehicles/Bus.h"
#include "vehicles/TankerTruck.h"
#include "vehicles/Car.h"
#include "vehicles/OBombKart.h"
#include "objects/OBombKart.h"
#include "objects/OPenguin.h"
#include "TrainCrossing.h"
#include <memory>
//#include "objects/GameObject.h"
extern "C" {
#include "camera.h"
@@ -184,11 +185,11 @@ void World::PreviousCourse() {
gWorldInstance.CurrentCourse = Courses[CourseIndex];
}
Object* World::AddObject(std::unique_ptr<GameObject> object) {
GameObject* rawPtr = object.get();
GameObjects.push_back(std::move(object));
return &rawPtr->o;
}
// Object* World::AddObject(std::unique_ptr<GameObject> object) {
// GameObject* rawPtr = object.get();
// GameObjects.push_back(std::move(object));
// return &rawPtr->o;
// }
AActor* World::AddActor(AActor* actor) {
Actors.push_back(actor);
@@ -240,22 +241,22 @@ void RemoveExpiredActors() {
}
void World::TickObjects() {
for (const auto& object : this->GameObjects) {
object->Tick();
}
//for (const auto& object : this->GameObjects) {
// object->Tick();
//}
}
void World::DrawObjects(Camera *camera) {
for (const auto& object : this->GameObjects) {
object->Draw(camera);
}
//for (const auto& object : this->GameObjects) {
// object->Draw(camera);
//}
}
void World::ExpiredObjects() {
this->GameObjects.erase(
std::remove_if(this->GameObjects.begin(), this->GameObjects.end(),
[](const std::unique_ptr<GameObject>& object) { return object->uuid == 0; }), // Example condition
this->GameObjects.end());
//this->GameObjects.erase(
// std::remove_if(this->GameObjects.begin(), this->GameObjects.end(),
// [](const std::unique_ptr<GameObject>& object) { return object->uuid == 0; }), // Example condition
// this->GameObjects.end());
}
void World::DestroyObjects() {
@@ -263,9 +264,9 @@ void World::DestroyObjects() {
}
Object* World::GetObjectByIndex(size_t index) {
if (index < this->GameObjects.size()) {
//if (index < this->GameObjects.size()) {
// Assuming GameActor::a is accessible, use reinterpret_cast if needed
return reinterpret_cast<Object*>(&this->GameObjects[index]->o);
}
// return reinterpret_cast<Object*>(&this->GameObjects[index]->o);
//}
return nullptr; // Or handle the error as needed
}