RomanRom2/whoa
1
0
Fork 0
mirror of https://github.com/whoahq/whoa.git synced 2026-02-01 16:22:45 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

chore(model): fix misaligned pointers in CM2Model::InitializeLoaded

Browse Source
This commit is contained in:
fallenoak 2025-10-23 17:20:31 -05:00
parent 84d6bdac05
commit 190ceb7a49
No known key found for this signature in database
GPG Key ID: 7628F8E61AEA070D
1 changed files with 51 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

83
src/model/CM2Model.cpp
View File

@ -12,6 +12,12 @@
#include <common/ObjectAlloc.hpp> #include <common/ObjectAlloc.hpp>
#include <tempest/Math.hpp> #include <tempest/Math.hpp>
// Alignment helpers
#define ALIGN(addr, type) ((addr + alignof(type) - 1) & ~(alignof(type) - 1))
#define ALIGN_PAD(addr, type) (ALIGN(addr, type) - addr)
#define ALIGN_SIZE(addr, type, count) ALIGN(addr + sizeof(type) * count, type) - addr
#define ALIGN_BUFFER(current, start, type) (current + ALIGN_PAD((ptrdiff_t)((char*)current - (char*)start), type))
uint32_t CM2Model::s_loadingSequence = 0xFFFFFFFF; uint32_t CM2Model::s_loadingSequence = 0xFFFFFFFF;
uint8_t* CM2Model::s_sequenceBase; uint8_t* CM2Model::s_sequenceBase;
uint32_t CM2Model::s_sequenceBaseSize; uint32_t CM2Model::s_sequenceBaseSize;
@ -993,26 +999,31 @@ int32_t CM2Model::InitializeLoaded() {
return 1; return 1;
} }
uint32_t dataSize // Allocate a single buffer to hold all unique per-model data per model object
= (sizeof(M2ModelBone) * this->m_shared->m_data->bones.Count())
+ (sizeof(uint32_t) * this->m_shared->m_data->loops.Count())
+ (sizeof(uint32_t) * this->m_shared->skinProfile->skinSections.Count())
+ (sizeof(M2ModelColor) * this->m_shared->m_data->colors.Count())
+ (sizeof(HTEXTURE) * this->m_shared->m_data->textures.Count())
+ (sizeof(M2ModelTextureWeight) * this->m_shared->m_data->textureWeights.Count())
+ (sizeof(M2ModelTextureTransform) * this->m_shared->m_data->textureTransforms.Count())
+ (sizeof(M2ModelAttachment) * this->m_shared->m_data->attachments.Count())
+ (sizeof(M2ModelLight) * this->m_shared->m_data->lights.Count())
+ (sizeof(M2ModelCamera) * this->m_shared->m_data->cameras.Count());
// TODO uint32_t bufferSize = 0;
// allocate space for particles and ribbons bufferSize += ALIGN_SIZE(bufferSize, M2ModelBone, this->m_shared->m_data->bones.Count());
bufferSize += ALIGN_SIZE(bufferSize, uint32_t, this->m_shared->m_data->loops.Count());
bufferSize += ALIGN_SIZE(bufferSize, uint32_t, this->m_shared->skinProfile->skinSections.Count());
bufferSize += ALIGN_SIZE(bufferSize, M2ModelColor, this->m_shared->m_data->colors.Count());
bufferSize += ALIGN_SIZE(bufferSize, HTEXTURE, this->m_shared->m_data->textures.Count());
bufferSize += ALIGN_SIZE(bufferSize, M2ModelTextureWeight, this->m_shared->m_data->textureWeights.Count());
bufferSize += ALIGN_SIZE(bufferSize, M2ModelTextureTransform, this->m_shared->m_data->textureTransforms.Count());
bufferSize += ALIGN_SIZE(bufferSize, M2ModelAttachment, this->m_shared->m_data->attachments.Count());
bufferSize += ALIGN_SIZE(bufferSize, M2ModelLight, this->m_shared->m_data->lights.Count());
bufferSize += ALIGN_SIZE(bufferSize, M2ModelCamera, this->m_shared->m_data->cameras.Count());
char* data = static_cast<char*>(SMemAlloc(dataSize, __FILE__, __LINE__, 0)); // TODO allocate space for particles and ribbons
auto buffer = static_cast<char*>(SMemAlloc(bufferSize, __FILE__, __LINE__, 0));
auto start = buffer;
// Allocate and initialize per-model data
if (this->m_shared->m_data->bones.Count()) { if (this->m_shared->m_data->bones.Count()) {
this->m_bones = reinterpret_cast<M2ModelBone*>(&data[0]); buffer = ALIGN_BUFFER(buffer, start, M2ModelBone);
data += (sizeof(M2ModelBone) * this->m_shared->m_data->bones.Count()); this->m_bones = reinterpret_cast<M2ModelBone*>(buffer);
buffer += sizeof(M2ModelBone) * this->m_shared->m_data->bones.Count();
for (int32_t i = 0; i < this->m_shared->m_data->bones.Count(); i++) { for (int32_t i = 0; i < this->m_shared->m_data->bones.Count(); i++) {
new (&this->m_bones[i]) M2ModelBone(); new (&this->m_bones[i]) M2ModelBone();
@ -1031,8 +1042,9 @@ int32_t CM2Model::InitializeLoaded() {
} }
if (this->m_shared->m_data->loops.Count()) { if (this->m_shared->m_data->loops.Count()) {
this->m_loops = reinterpret_cast<uint32_t*>(&data[0]); buffer = ALIGN_BUFFER(buffer, start, uint32_t);
data += (sizeof(uint32_t) * this->m_shared->m_data->loops.Count()); this->m_loops = reinterpret_cast<uint32_t*>(buffer);
buffer += sizeof(uint32_t) * this->m_shared->m_data->loops.Count();
for (int32_t i = 0; i < this->m_shared->m_data->loops.Count(); i++) { for (int32_t i = 0; i < this->m_shared->m_data->loops.Count(); i++) {
if (this->m_loops[i]) { if (this->m_loops[i]) {
@ -1043,8 +1055,9 @@ int32_t CM2Model::InitializeLoaded() {
if (this->m_shared->skinProfile->skinSections.Count()) { if (this->m_shared->skinProfile->skinSections.Count()) {
this->m_skinSections = reinterpret_cast<uint32_t*>(&data[0]); buffer = ALIGN_BUFFER(buffer, start, uint32_t);
data += (sizeof(uint32_t) * this->m_shared->skinProfile->skinSections.Count()); this->m_skinSections = reinterpret_cast<uint32_t*>(buffer);
buffer += sizeof(uint32_t) * this->m_shared->skinProfile->skinSections.Count();
if (this->model30) { if (this->model30) {
memcpy(this->m_skinSections, model30->m_skinSections, sizeof(uint32_t) * this->m_shared->skinProfile->skinSections.Count()); memcpy(this->m_skinSections, model30->m_skinSections, sizeof(uint32_t) * this->m_shared->skinProfile->skinSections.Count());
@ -1061,8 +1074,9 @@ int32_t CM2Model::InitializeLoaded() {
} }
if (this->m_shared->m_data->colors.Count()) { if (this->m_shared->m_data->colors.Count()) {
this->m_colors = reinterpret_cast<M2ModelColor*>(&data[0]); buffer = ALIGN_BUFFER(buffer, start, M2ModelColor);
data += (sizeof(M2ModelColor) * this->m_shared->m_data->colors.Count()); this->m_colors = reinterpret_cast<M2ModelColor*>(buffer);
buffer += sizeof(M2ModelColor) * this->m_shared->m_data->colors.Count();
for (int32_t i = 0; i < this->m_shared->m_data->colors.Count(); i++) { for (int32_t i = 0; i < this->m_shared->m_data->colors.Count(); i++) {
new (&this->m_colors[i]) M2ModelColor(); new (&this->m_colors[i]) M2ModelColor();
@ -1070,8 +1084,9 @@ int32_t CM2Model::InitializeLoaded() {
} }
if (this->m_shared->m_data->textures.Count()) { if (this->m_shared->m_data->textures.Count()) {
this->m_textures = reinterpret_cast<HTEXTURE*>(&data[0]); buffer = ALIGN_BUFFER(buffer, start, HTEXTURE);
data += (sizeof(HTEXTURE) * this->m_shared->m_data->textures.Count()); this->m_textures = reinterpret_cast<HTEXTURE*>(buffer);
buffer += sizeof(HTEXTURE) * this->m_shared->m_data->textures.Count();
for (int32_t i = 0; i < this->m_shared->m_data->textures.Count(); i++) { for (int32_t i = 0; i < this->m_shared->m_data->textures.Count(); i++) {
HTEXTURE textureHandle = this->model30 HTEXTURE textureHandle = this->model30
@ -1085,8 +1100,9 @@ int32_t CM2Model::InitializeLoaded() {
} }
if (this->m_shared->m_data->textureWeights.Count()) { if (this->m_shared->m_data->textureWeights.Count()) {
this->m_textureWeights = reinterpret_cast<M2ModelTextureWeight*>(&data[0]); buffer = ALIGN_BUFFER(buffer, start, M2ModelTextureWeight);
data += (sizeof(M2ModelTextureWeight) * this->m_shared->m_data->textureWeights.Count()); this->m_textureWeights = reinterpret_cast<M2ModelTextureWeight*>(buffer);
buffer += sizeof(M2ModelTextureWeight) * this->m_shared->m_data->textureWeights.Count();
for (int32_t i = 0; i < this->m_shared->m_data->textureWeights.Count(); i++) { for (int32_t i = 0; i < this->m_shared->m_data->textureWeights.Count(); i++) {
new (&this->m_textureWeights[i]) M2ModelTextureWeight(); new (&this->m_textureWeights[i]) M2ModelTextureWeight();
@ -1096,8 +1112,9 @@ int32_t CM2Model::InitializeLoaded() {
// TODO texture transforms // TODO texture transforms
if (this->m_shared->m_data->attachments.Count()) { if (this->m_shared->m_data->attachments.Count()) {
this->m_attachments = reinterpret_cast<M2ModelAttachment*>(&data[0]); buffer = ALIGN_BUFFER(buffer, start, M2ModelAttachment);
data += (sizeof(M2ModelAttachment) * this->m_shared->m_data->attachments.Count()); this->m_attachments = reinterpret_cast<M2ModelAttachment*>(buffer);
buffer += sizeof(M2ModelAttachment) * this->m_shared->m_data->attachments.Count();
for (int32_t i = 0; i < this->m_shared->m_data->attachments.Count(); i++) { for (int32_t i = 0; i < this->m_shared->m_data->attachments.Count(); i++) {
new (&this->m_attachments[i]) M2ModelAttachment(); new (&this->m_attachments[i]) M2ModelAttachment();
@ -1108,8 +1125,9 @@ int32_t CM2Model::InitializeLoaded() {
} }
if (this->m_shared->m_data->lights.Count()) { if (this->m_shared->m_data->lights.Count()) {
this->m_lights = reinterpret_cast<M2ModelLight*>(&data[0]); buffer = ALIGN_BUFFER(buffer, start, M2ModelLight);
data += (sizeof(M2ModelLight) * this->m_shared->m_data->lights.Count()); this->m_lights = reinterpret_cast<M2ModelLight*>(buffer);
buffer += sizeof(M2ModelLight) * this->m_shared->m_data->lights.Count();
for (int32_t i = 0; i < this->m_shared->m_data->lights.Count(); i++) { for (int32_t i = 0; i < this->m_shared->m_data->lights.Count(); i++) {
new (&this->m_lights[i]) M2ModelLight(); new (&this->m_lights[i]) M2ModelLight();
@ -1126,8 +1144,9 @@ int32_t CM2Model::InitializeLoaded() {
} }
if (this->m_shared->m_data->cameras.Count()) { if (this->m_shared->m_data->cameras.Count()) {
this->m_cameras = reinterpret_cast<M2ModelCamera*>(&data[0]); buffer = ALIGN_BUFFER(buffer, start, M2ModelCamera);
data += (sizeof(M2ModelCamera) * this->m_shared->m_data->cameras.Count()); this->m_cameras = reinterpret_cast<M2ModelCamera*>(buffer);
buffer += sizeof(M2ModelCamera) * this->m_shared->m_data->cameras.Count();
for (int32_t i = 0; i < this->m_shared->m_data->cameras.Count(); i++) { for (int32_t i = 0; i < this->m_shared->m_data->cameras.Count(); i++) {
new (&this->m_cameras[i]) M2ModelCamera(); new (&this->m_cameras[i]) M2ModelCamera();