summaryrefslogtreecommitdiff
path: root/src/engine/objects/Snowman.cpp
diff options
context:
space:
mode:
authorMegaMech <MegaMech@users.noreply.github.com>2025-11-09 19:07:44 -0700
committerGitHub <noreply@github.com>2025-11-09 19:07:44 -0700
commitde9c5d510175bba11ab8704e67be3a3a94f9149e (patch)
tree34c42dbfe9f2a6eb5fbce5f6a31b532ff2a3f243 /src/engine/objects/Snowman.cpp
parent760fa3bf5226c2a6052a5d4d53fd0e27f2911e60 (diff)
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>
Diffstat (limited to 'src/engine/objects/Snowman.cpp')
-rw-r--r--src/engine/objects/Snowman.cpp54
1 files changed, 40 insertions, 14 deletions
diff --git a/src/engine/objects/Snowman.cpp b/src/engine/objects/Snowman.cpp
index cbb708fbf..dd98e2df0 100644
--- a/src/engine/objects/Snowman.cpp
+++ b/src/engine/objects/Snowman.cpp
@@ -17,31 +17,32 @@ static const char* sSnowmanHeadList[] = { d_course_frappe_snowland_snowman_head
size_t OSnowman::_count = 0;
-OSnowman::OSnowman(const FVector& pos) {
+OSnowman::OSnowman(const SpawnParams& params) : OObject(params) {
Name = "Snowman";
+ ResourceName = "mk:snowman";
_idx = _count;
- _pos = pos;
+ Pos = params.Location.value_or(FVector(0, 0, 0));
find_unused_obj_index(&_headIndex);
init_object(_headIndex, 0);
_objectIndex = _headIndex;
- gObjectList[_headIndex].origin_pos[0] = pos.x * xOrientation;
- gObjectList[_headIndex].origin_pos[1] = pos.y + 5.0 + 3.0;
- gObjectList[_headIndex].origin_pos[2] = pos.z;
- gObjectList[_headIndex].pos[0] = pos.x * xOrientation;
- gObjectList[_headIndex].pos[1] = pos.y + 5.0 + 3.0;
- gObjectList[_headIndex].pos[2] = pos.z;
+ gObjectList[_headIndex].origin_pos[0] = Pos.x * xOrientation;
+ gObjectList[_headIndex].origin_pos[1] = Pos.y + 5.0 + 3.0;
+ gObjectList[_headIndex].origin_pos[2] = Pos.z;
+ gObjectList[_headIndex].pos[0] = Pos.x * xOrientation;
+ gObjectList[_headIndex].pos[1] = Pos.y + 5.0 + 3.0;
+ gObjectList[_headIndex].pos[2] = Pos.z;
find_unused_obj_index(&_bodyIndex);
init_object(_bodyIndex, 0);
- gObjectList[_bodyIndex].origin_pos[0] = pos.x * xOrientation;
- gObjectList[_bodyIndex].origin_pos[1] = pos.y + 3.0;
- gObjectList[_bodyIndex].origin_pos[2] = pos.z;
+ gObjectList[_bodyIndex].origin_pos[0] = Pos.x * xOrientation;
+ gObjectList[_bodyIndex].origin_pos[1] = Pos.y + 3.0;
+ gObjectList[_bodyIndex].origin_pos[2] = Pos.z;
gObjectList[_bodyIndex].unk_0D5 = 0; // Section Id no longer used.
- gObjectList[_bodyIndex].pos[0] = pos.x * xOrientation;
- gObjectList[_bodyIndex].pos[1] = pos.y + 3.0;
- gObjectList[_bodyIndex].pos[2] = pos.z;
+ gObjectList[_bodyIndex].pos[0] = Pos.x * xOrientation;
+ gObjectList[_bodyIndex].pos[1] = Pos.y + 3.0;
+ gObjectList[_bodyIndex].pos[2] = Pos.z;
_count++;
}
@@ -348,6 +349,31 @@ void OSnowman::func_80083B0C(s32 objectIndex) {
set_object_flag(objectIndex, 0x04000210);
}
+void OSnowman::Translate(FVector pos) {
+ if ((_objectIndex != -1) && (_bodyIndex != -1)) {
+ SpawnPos = pos;
+
+ Object* object = &gObjectList[_objectIndex];
+
+ object->pos[0] = pos.x;
+ object->pos[1] = pos.y;
+ object->pos[2] = pos.z;
+ object->origin_pos[0] = pos.x;
+ object->origin_pos[1] = pos.y;
+ object->origin_pos[2] = pos.z;
+
+ object = &gObjectList[_bodyIndex];
+ object->pos[0] = pos.x;
+ object->pos[1] = pos.y - 5.0;
+ object->pos[2] = pos.z;
+ object->origin_pos[0] = pos.x;
+ object->origin_pos[1] = pos.y - 5.0;
+ object->origin_pos[2] = pos.z;
+ } else {
+ printf("Editor tried to translate null OObject\n");
+ }
+}
+
void OSnowman::func_80083538(s32 objectIndex, Vec3f arg1, s32 arg2, s32 arg3) {
Object* object;